Merge branch 'release-0.6.8'