Revert "Revert "Combo Update""

This reverts commit c03c14ccc2aff7ebf2ec4043d2a2ad9f48aff385.