Merge pull request #1435 from TheBlueMatt/2022-04-1126-first-step