update from svn r93941