Apply vanilla 3.12.8 patches