Merge pull request #7615 from thess/cci-hashcheck