r879 - trunk/v7