Merge "Merge branch 'stable-6.0'"