Thread: merge [86540] to fix #9319.

[SVN r86552]