Merge branch 'stable-6.4'