update from svn r94360