initial commit from svn revision 38934