Merge pull request #9615 from neheb/sig