Merge branch 'stable-4.0'