GitLab service scheduled maintenance on Friday, March 21st 2025 as of 08h00 Geneva time for an estimated period of 1 hour. Further information under OTG0154918.
Merge branch 'cherry-pick-bf9908a7' into '21.0' See merge request !2823 Former-commit-id: 8e9da72e