Merge branch 'develop'
v 1.2.0