Aply vanilla 3.16.2 patches
Merge branch 'master' into vanilla-ravion