Merge pull request #6251 from LevityNL/master