update from svn r92859