release 1.7
Merge branch 'release/1.7'

* release/1.7:
  release 1.7