Merge pull request #1112 from TheBlueMatt/2021-10-mon-refactors