Merge pull request #681 from valentinewallace/data-persister-refactor