merge from master-analyze
merge from master-analyze
Merge branch 'master-analyze' of github.com:qorelogic/hash into master-deploy-01
conflict resolved