Merge branch 'release/v.1.1' into develop
Merge branch 'release/v.1.2'