merge [86344] from trunk

[SVN r86427]