Merge "composable heat services"