initial import of svn r10818