Merge branch 'hotfix/2.0.5'
Merge branch 'release/2.1'
removed test for exception
Merge branch 'hotfix/2.1.1' into develop