Apply vanilla 3.18.0 patches