Apply vanilla 3.9.0 patches