Sweeping !16710 from 21.0 to master. Update the HI CMR to run 365678 See merge request atlas/athena!16772 Former-commit-id: 3d042ca1