update from svn r94500