Merge branch 'hotfix/2.1.1'
Improve test coverage.
Merge branch 'hotfix/2.1.2' into develop