Merge pull request #6769