Thread: merge 84414 to fix #8596.

svn path=; revision=84468