Bump version to 2.1 and include new hash0 changes