Merge branch 'release/2.1.05' into develop
Fix clustering key ranges.
Upgrade version number.
Merge branch 'release/2.1.06'