Merge branch 'stable-2.9' into master