Merge branch 'hotfix/v1' into develop
add articles
Merge branch 'release/v1.2.0'