Merge pull request #1417 from johncantrell97/generic-persist