Merge pull request #1582 from TheBlueMatt/2022-06-0.0.109