Apply vanilla 3.9.10 patches
Merge branch 'master' 3.10.10 into vanilla-ravion