r279 - trunk/v7