Updated patch for 3.9.7