Merge pull request #7230 from Asizon/master