Feature/store persistence

Merged Agate requested to merge feature/store-persistence into develop

Merge request reports