Sweeping !46488 from 22.0-mc20 to master. Urgent - Master dqegamma 07092021 for22.0 mc20

Atlas Nightlybuildrequested to merge
cherry-pick-01eb1187193-master into master

Urgent - Master dqegamma 07092021 for22.0 mc20

See merge request !46488 (merged)

Merge request reports