Re-rolled patch #3, Attached interdiff for same.