includes MR: https://gitlab.cern.ch/atlas/athena/-/merge_requests/34496 https://gitlab.cern.ch/atlas/athena/-/merge_requests/34514 https://gitlab.cern.ch/atlas/athena/-/merge_requests/34554 https://gitlab.cern.ch/atlas/athena/-/merge_requests/34556 https://gitlab.cern.ch/atlas/athena/-/merge_requests/34557