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