update from svn r94356