Merge pull request #6728 from nupplaphil/issue/6337-warnings