support 1.2.1
Merge branch 'hotfix/1.2.0'

* hotfix/1.2.0:
  support 1.2.1