Merge/2.10.x to master

review by @gkosskowski