Merge pull request #7482 from sotux/master