5150279cc, 97bd61711, 900c76425 and 4f23ad330 went to main, reviewed and changed, as #1745. They are taken out here so main brings them in as merged, rather than as two copies of the same changes in conflict.
5150279cc
97bd61711
900c76425
4f23ad330