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