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