Re-rolling patch and try to update testing errors in patch.