Apply vanilla 3.11.6 patches