merge 2.10.x to master

Review by @adriaanm.