Apply vanilla 3.12.1 patches