update from svn r94329