Merge pull request #6428