Reland bsmedberg/combiner

This reverts commit b9811af5853f30665c7471e270ae6e1ef0066f56.