Merge branch 'feature/RefactorConfig' into liveSystem