Merge remote-tracking branch 'origin/feature/config_manager' into develop