Merge pull request #2104 from rj667/main
(fix) Convert unnecessary multi line warnings to single lines