update from svn r94325