Merge branch 'hotfix/v1.2' into production

* hotfix/v1.2:
  lalalalal
asdfasdfasdf
Merge branch 'hotfix/v'

* hotfix/v:
  asdfasdfasdf