r17328: make better usage of the composite api