Daily merge for 22.0 into master, Sept 20

Again done with --strategy-option ours

The conflicts arising without this option were all due to change-sets manually implemented in both branches (aka sweep by hand)