Daily merge of 23.0 into master

Closed Walter Lampl requested to merge wlampl/athena:sweep_23.0_master_2023-04-07 into master

This sweep contains the following MRs:

No merge conflict encountered

Merge request reports