Merge branch 'release-0.11.0'