update from svn r94374