Merge pull request #1605 from TheBlueMatt/2022-07-smaller-mpp-parts