Merge 2.10.x: #2346 edition

Merge #2346 into master