Merge "Update default hash storage settings"