apply vanilla 3.11.5 patch
Merge branch 'master' into vanilla-ravion