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.
Sweeping !9614 from 21.0 to master. Fix for ATR-16605, round two See merge request atlas/athena!9978 Former-commit-id: 731a9a68