update from svn r94332