Merge branch 'hotfix/2.1.1' into develop
rename sortedKeyEnumerator
delete rubbish file
Merge branch 'release/2.2.0'