Re-rolled patch #4, Attached interdiff for same. Please review.