includes MR: https://gitlab.cern.ch/atlas/athena/-/merge_requests/34675 https://gitlab.cern.ch/atlas/athena/-/merge_requests/34799 https://gitlab.cern.ch/atlas/athena/-/merge_requests/34890 https://gitlab.cern.ch/atlas/athena/-/merge_requests/35038 https://gitlab.cern.ch/atlas/athena/-/merge_requests/35062