Apply vanilla 3.11.0 patches