Apply vanilla 3.9.4 patches