Merge [81027] from the trunk.

svn path=; revision=84442