Merge pull request #1798 from TheBlueMatt/2022-10-112