Apply vanilla 3.10.7 patches
Merge branch 'master' (3.10.7) into vanilla-ravion