Merge branch 'v0.1.12'