Apply vanilla 3.12.5 patches