Merge pull request #1617 from TheBlueMatt/2022-07-base-ppm