Merge pull request #1588 from TheBlueMatt/2022-06-ffs-dumb-ser