-develop branch
-minor change
Merge branch 'hotfix-error' into develop

* hotfix-error:
  -minor change
Merge branch 'release/1.0'