trunk 26783 - 0.7.0.0