Prepare 0.7-3
Merge branch 'release/0.7-3' into develop

* release/0.7-3:
  Prepare 0.7-3