Merge/2.10.3 to 2.10.x

Review by @adriaanm