Backport to master update-to-2.0.0 branch

Workaround for the failed backport instruction at !2949 (merged)

Edited by Vicente Bolea

Merge request reports

Loading