Apply vanilla 3.8.2 patches