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