2022-09-01: daily merge of 22.0 into master

Frank Winklmeierrequested to merge
fwinkl/athena:sweep_22.0_master_2022-09-01 into master

Daily merge. No conflicts.

Merge request reports