Merge pull request #6538 from nyway/master