Merge branch 'release/0.11'