Apply vanilla 3.12.1 patches
Merge branch 'master' into vanilla-ravion
Merge branch 'vanilla-ravion' into memlcd-ravion