Refactoring setup: split persistent data handling
Merge branch 'develop' into setup
Merge branch 'setup' into develop