Merge pull request #933 from TheBlueMatt/2021-05-ser-fast