lalalalal
Merge branch 'hotfix/v1.2' into production

* hotfix/v1.2:
  lalalalal