Merge branch 'stable-2.8' into master