Merge/2.10.x to master 2

Review by @adriaanm.