Merge branch 'cherry-pick-89531978-2' into '21.3'

Manual sweep to 21.3

See merge request !22392

(cherry picked from commit d1c75ad5)

4b2aff03 Merge branch '21.0-FastCaloSimDev' into '21.0'