Merge pull request #874 from TheBlueMatt/2021-04-persister-export