Merge branch 'stable-2.11' into stable-2.12