Merge pull request #1013 from TheBlueMatt/2021-07-warning-msgs