Accidentally pushed the changes to upstream :-( Therefore commenting out the visible changes...
Adding logging to persistence (only for settingsstore)