Apply vanilla 3.12.6 patches