update from svn r93775