Merge pull request #5035 from TeNNoX/master