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