Merged in [grep-hash-digits] branch. See