Merge pull request #1956 from TheBlueMatt/2023-01-ser-cleanups