includes MR: https://gitlab.cern.ch/atlas/athena/-/merge_requests/35245 https://gitlab.cern.ch/atlas/athena/-/merge_requests/35252
includes MR: https://gitlab.cern.ch/atlas/athena/-/merge_requests/35245 https://gitlab.cern.ch/atlas/athena/-/merge_requests/35252