Merge "Merge branch 'stable-2.9' into stable-2.10" into stable-2.10