Add vanilla 3.10.4 patches
Merge branch 'master' into vanilla-ravion
Push source to 3.10.4