update from svn r94358