2023-04-24: merge 23.0 into master

Merged Edward Moyse requested to merge emoyse/athena:sweep_23.0_master_2023-04-24 into master

This sweep contains the following MRs:

Merge request reports