Merge "Fix ref to SERVICE_MODEL"