Updated to v1.7
Merge branch 'master' into develop

* master:
  Updated to v1.7