Merge commit 'v0.7.1'