Support new cloned upstream API instead of clone