The difference between master and the old data-persistence branch was huge, seems more effective to manually cherry pick the changes and integrate them
