Merge pull request #1632 from TheBlueMatt/2022-07-warnings