manual merge object_config branch