Merge branch 'release/1.2.0' into develop
fixed tests
updated deps
Merge branch 'develop'