update from svn r94005