2022-08-16: Daily merge of 22.0 into master

Merging nightly/22.0/2022-08-16T2101 into master. No conflicts!

Reverted !55921 (merged) due to compilation errors as sweep was not done properly (so not really needed).