Merge branch 'master' into bump_v0.6.7
Bump version to v0.6.7