update from svn r94213