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