r17337: make better usage of the composite api