split from caparica-bundle