Merge v0.7.1