imported from svn rev 14372