Merge pull request #1712 from TheBlueMatt/2022-09-111