Apply vanilla 3.12.4 patches