Apply vanilla 3.18.1 patches