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