Updating with 1.2.1 changes
Merge branch 'v1.2.1' into ace-upgrade

* v1.2.1:
  Updating with 1.2.1 changes