Apply vanilla 3.8.7 patches