Apply vanilla 3.18.1 patches
Merge branch 'master' 3.18.1 into vanilla-ravion