update from svn r94198