Revert "Revert "Revert "Revert "[Consolidated] Different spawn groups""""

This reverts commit cb05f4800e78f7b93726f937c27a63fcef4348a6.