2023-06-16: merge of 23.0 into master

This sweep contains the following MRs:

Merge request reports