Closed requested to merge tuna/athena:22.0 into 22.0
Development of MuonNSWCommonDecode has proceeded in master, and we'd like to catch up 22.0 with master.
There are a couple commits from master which I think need to be cherry-picked into 22.0. I believe they're all included here. I used the command line because gitlab's cherry-pick interface gave an error.
git cherry-pick 4a5e0a77 -m 1(!57755 (merged))
git cherry-pick 597c72f2(!57847 (merged))
git cherry-pick c08eb462(!58364 (merged)) (the big one)