Merge branch 'stable-2.10' into stable-2.11