Merge branch 'refs/heads/6.0'