Merge/2.10.x to 2.10.3

`git merge origin/2.10.x`

Review by @JamesIry, /cc @gkossakowski, @adriaanm