2023-04-22: merge 23.0 into master

Merged Frank Winklmeier requested to merge fwinkl/athena:sweep_23.0_master_2023-04-22 into master

This sweep contains the following MRs:

Merge request reports