Merge branch 'hotfix/1.1.0'

* hotfix/1.1.0:
  support 1.1.0
support 1.2.1
Merge branch 'hotfix/1.2.0' into develop

* hotfix/1.2.0:
  support 1.2.1