update from svn r94341