update from svn r94497