r824 - trunk