Merged fix for #8595

svn path=; revision=84392