Merge pull request #7330 from mpg/hashes-wrapup

Driver-only hashes: wrap-up