Merge release/v1.2.0 into develop
updated the documentation
Merge branch 'develop'
updated the docs