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