Merge branch 'release/1.1.1' into develop
Update changelog
Merge branch 'release/1.1.2'