temp commit: we need to bump the api to really support this feature