r805 - trunk