update from svn r93964