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