Merge pull request #6895 from nupplaphil/issue/legacy_loglevel