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