Semi-manual merge branch 'master' into for-2.10