merge [85488] from trunk, fixes #9049

[SVN r85550]