Aplly vanilla 3.13.1 patches
Merge branch 'master' (3.13.1) into vanilla-ravion