Apply vanilla 3.8.4 patches