Assorted hash database module improvements
Merge pull request #360 from rcordovano/develop-rc1

Assorted hash database module improvements