Merge pull request #6500 from LevityNL/master