Thread: apply patch #8550.

svn path=; revision=84684