Merge branch 'release/2.0' into develop
Enable sha1 and sha256 commands
Bump version to v2.1
Merge branch 'release/2.1'