Merged #7936 fix

svn path=; revision=84426