Apply vanilla 3.9.4 patches
Merge branch 'master' into mx51vanilla