Sweeping !20815 from 21.3 to 21.9. Sweep !20637 to 21.3

Atlas Nightlybuildrequested to merge
cherry-pick-20b53e3f7d-21.9 into 21.9

Sweep !20637 (merged) to 21.3

See merge request !20815 (merged)

Merge request reports