Apply vanilla 3.8.0 patches