Merge branch 'release/2.1.0'
Merge branch 'hotfix/2.1.1' into develop