Sweeping !29423 from 21.0 to master. Also testing for SimulateCavern for EtaPhiFilter

Atlas Nightlybuildrequested to merge
cherry-pick-68172a3cd7-master into master

Also testing for SimulateCavern for EtaPhiFilter

See merge request !29423 (merged)

Merge request reports