Merge branch 'stable-4.11'