update from svn r94274