Merge branch 'rel-0.11.0' into stable
Merge branch 'stable'