Merge branch 'hotfix/1.1.3' into develop
Merge branch 'release/2.0.0'