Merge v2.10.1-245-g5147bb2 to master

... and the 2.11 incarnation of SI-7377, 962f88e.

Review by @paulp