Merge branch 'feature/config_manager' into develop