2023-03-20: merge 23.0 into master

Frank Winklmeierrequested to merge
fwinkl/athena:sweep_23.0_master_2023-03-20 into master

Manual merge of 23.0 into master. No conflicts.

Merge request reports