Merge pull request #1633 from TheBlueMatt/2022-07-110