update from svn r94346