BRANCH 4.2-105: updated hash handling to be more customizable