Merge pull request #6489 from nyway/master