Merge "Fix model_manager cluster model"