Merge branch 'release-0.7' into feature-cli-input