Merge/v2.10.1 235 g4525e92 to master

The only notable conflict was from SI-6286 / 67c2d6d.

Review by @adriaanm