update from svn r94457