merge [83504] from trunk

svn path=; revision=84525