diff --git a/src/mpi/coll/algorithms/treealgo/treealgo.c b/src/mpi/coll/algorithms/treealgo/treealgo.c
index da5ac83eef9..d806e3b8f51 100644
--- a/src/mpi/coll/algorithms/treealgo/treealgo.c
+++ b/src/mpi/coll/algorithms/treealgo/treealgo.c
@@ -33,37 +33,42 @@ int MPII_Treealgo_comm_cleanup(MPIR_Comm * comm)
     return mpi_errno;
 }
 
-static bool match_param_topo_aware(MPIR_Treealgo_param_t * param, int root, int k)
+static bool match_param_topo_aware(MPIR_Treealgo_param_t * param, int coll_group, int root, int k)
 {
     return (param->type == MPIR_TREE_TYPE_TOPOLOGY_AWARE &&
+            param->coll_group == coll_group && coll_group < MPIR_SUBGROUP_NUM_RESERVED &&
             param->root == root && param->u.topo_aware.k == k);
 }
 
-static void set_param_topo_aware(MPIR_Treealgo_param_t * param, int root, int k)
+static void set_param_topo_aware(MPIR_Treealgo_param_t * param, int coll_group, int root, int k)
 {
     param->type = MPIR_TREE_TYPE_TOPOLOGY_AWARE;
+    param->coll_group = coll_group;
     param->root = root;
     param->u.topo_aware.k = k;
 }
 
-static bool match_param_topo_aware_k(MPIR_Treealgo_param_t * param, int root, int k)
+static bool match_param_topo_aware_k(MPIR_Treealgo_param_t * param, int coll_group, int root, int k)
 {
     return (param->type == MPIR_TREE_TYPE_TOPOLOGY_AWARE_K &&
+            param->coll_group == coll_group && coll_group < MPIR_SUBGROUP_NUM_RESERVED &&
             param->root == root && param->u.topo_aware.k == k);
 }
 
-static void set_param_topo_aware_k(MPIR_Treealgo_param_t * param, int root, int k)
+static void set_param_topo_aware_k(MPIR_Treealgo_param_t * param, int coll_group, int root, int k)
 {
     param->type = MPIR_TREE_TYPE_TOPOLOGY_AWARE_K;
+    param->coll_group = coll_group;
     param->root = root;
     param->u.topo_aware.k = k;
 }
 
-static inline bool match_param_topo_wave(MPIR_Treealgo_param_t * param,
+static inline bool match_param_topo_wave(MPIR_Treealgo_param_t * param, int coll_group,
                                          int root, int overhead, int lat_diff_groups,
                                          int lat_diff_switches, int lat_same_switches)
 {
     return (param->type == MPIR_TREE_TYPE_TOPOLOGY_WAVE &&
+            param->coll_group == coll_group && coll_group < MPIR_SUBGROUP_NUM_RESERVED &&
             param->root == root &&
             param->u.topo_wave.overhead == overhead &&
             param->u.topo_wave.lat_diff_groups == lat_diff_groups &&
@@ -71,11 +76,12 @@ static inline bool match_param_topo_wave(MPIR_Treealgo_param_t * param,
             param->u.topo_wave.lat_same_switches == lat_same_switches);
 }
 
-static inline void set_param_topo_wave(MPIR_Treealgo_param_t * param,
+static inline void set_param_topo_wave(MPIR_Treealgo_param_t * param, int coll_group,
                                        int root, int overhead, int lat_diff_groups,
                                        int lat_diff_switches, int lat_same_switches)
 {
     param->type = MPIR_TREE_TYPE_TOPOLOGY_WAVE;
+    param->coll_group = coll_group;
     param->root = root;
     param->u.topo_wave.overhead = overhead;
     param->u.topo_wave.lat_diff_groups = lat_diff_groups;
@@ -125,7 +131,8 @@ int MPIR_Treealgo_tree_create(int rank, int nranks, int tree_type, int k, int ro
 }
 
 
-int MPIR_Treealgo_tree_create_topo_aware(MPIR_Comm * comm, int tree_type, int k, int root,
+int MPIR_Treealgo_tree_create_topo_aware(MPIR_Comm * comm, int coll_group, int tree_type,
+                                         int k, int root,
                                          bool enable_reorder, MPIR_Treealgo_tree_t * ct)
 {
     int mpi_errno = MPI_SUCCESS;
@@ -135,7 +142,7 @@ int MPIR_Treealgo_tree_create_topo_aware(MPIR_Comm * comm, int tree_type, int k,
     switch (tree_type) {
         case MPIR_TREE_TYPE_TOPOLOGY_AWARE:
             if (!comm->coll.cached_tree ||
-                !match_param_topo_aware(&comm->coll.cached_tree_param, root, k)) {
+                !match_param_topo_aware(&comm->coll.cached_tree_param, coll_group, root, k)) {
                 if (comm->coll.cached_tree) {
                     MPIR_Treealgo_tree_free(comm->coll.cached_tree);
                 } else {
@@ -144,11 +151,11 @@ int MPIR_Treealgo_tree_create_topo_aware(MPIR_Comm * comm, int tree_type, int k,
                                                             MPL_MEM_BUFFER);
                 }
                 mpi_errno =
-                    MPII_Treeutil_tree_topology_aware_init(comm, k, root, enable_reorder,
-                                                           comm->coll.cached_tree);
+                    MPII_Treeutil_tree_topology_aware_init(comm, coll_group, k, root,
+                                                           enable_reorder, comm->coll.cached_tree);
                 MPIR_ERR_CHECK(mpi_errno);
                 *ct = *comm->coll.cached_tree;
-                set_param_topo_aware(&comm->coll.cached_tree_param, root, k);
+                set_param_topo_aware(&comm->coll.cached_tree_param, coll_group, root, k);
             }
             *ct = *comm->coll.cached_tree;
             utarray_new(ct->children, &ut_int_icd, MPL_MEM_COLL);
@@ -160,7 +167,7 @@ int MPIR_Treealgo_tree_create_topo_aware(MPIR_Comm * comm, int tree_type, int k,
 
         case MPIR_TREE_TYPE_TOPOLOGY_AWARE_K:
             if (!comm->coll.cached_tree ||
-                !match_param_topo_aware_k(&comm->coll.cached_tree_param, root, k)) {
+                !match_param_topo_aware_k(&comm->coll.cached_tree_param, coll_group, root, k)) {
                 if (comm->coll.cached_tree) {
                     MPIR_Treealgo_tree_free(comm->coll.cached_tree);
                 } else {
@@ -169,11 +176,12 @@ int MPIR_Treealgo_tree_create_topo_aware(MPIR_Comm * comm, int tree_type, int k,
                                                             MPL_MEM_BUFFER);
                 }
                 mpi_errno =
-                    MPII_Treeutil_tree_topology_aware_k_init(comm, k, root, enable_reorder,
+                    MPII_Treeutil_tree_topology_aware_k_init(comm, coll_group, k, root,
+                                                             enable_reorder,
                                                              comm->coll.cached_tree);
                 MPIR_ERR_CHECK(mpi_errno);
                 *ct = *comm->coll.cached_tree;
-                set_param_topo_aware_k(&comm->coll.cached_tree_param, root, k);
+                set_param_topo_aware_k(&comm->coll.cached_tree_param, coll_group, root, k);
             }
             *ct = *comm->coll.cached_tree;
             utarray_new(ct->children, &ut_int_icd, MPL_MEM_COLL);
@@ -201,7 +209,7 @@ int MPIR_Treealgo_tree_create_topo_aware(MPIR_Comm * comm, int tree_type, int k,
 }
 
 
-int MPIR_Treealgo_tree_create_topo_wave(MPIR_Comm * comm, int k, int root,
+int MPIR_Treealgo_tree_create_topo_wave(MPIR_Comm * comm, int coll_group, int k, int root,
                                         bool enable_reorder, int overhead, int lat_diff_groups,
                                         int lat_diff_switches, int lat_same_switches,
                                         MPIR_Treealgo_tree_t * ct)
@@ -211,21 +219,21 @@ int MPIR_Treealgo_tree_create_topo_wave(MPIR_Comm * comm, int k, int root,
     MPIR_FUNC_ENTER;
 
     if (!comm->coll.cached_tree ||
-        !match_param_topo_wave(&comm->coll.cached_tree_param, root, overhead,
-                               lat_diff_groups, lat_diff_switches, lat_same_switches)) {
+        !match_param_topo_wave(&comm->coll.cached_tree_param, coll_group, root,
+                               overhead, lat_diff_groups, lat_diff_switches, lat_same_switches)) {
         if (comm->coll.cached_tree) {
             MPIR_Treealgo_tree_free(comm->coll.cached_tree);
         } else {
             comm->coll.cached_tree =
                 (MPIR_Treealgo_tree_t *) MPL_malloc(sizeof(MPIR_Treealgo_tree_t), MPL_MEM_BUFFER);
         }
-        mpi_errno = MPII_Treeutil_tree_topology_wave_init(comm, k, root, enable_reorder, overhead,
-                                                          lat_diff_groups, lat_diff_switches,
-                                                          lat_same_switches,
-                                                          comm->coll.cached_tree);
+        mpi_errno =
+            MPII_Treeutil_tree_topology_wave_init(comm, coll_group, k, root, enable_reorder,
+                                                  overhead, lat_diff_groups, lat_diff_switches,
+                                                  lat_same_switches, comm->coll.cached_tree);
         MPIR_ERR_CHECK(mpi_errno);
         *ct = *comm->coll.cached_tree;
-        set_param_topo_wave(&comm->coll.cached_tree_param, root, overhead,
+        set_param_topo_wave(&comm->coll.cached_tree_param, coll_group, root, overhead,
                             lat_diff_groups, lat_diff_switches, lat_same_switches);
     }
     *ct = *comm->coll.cached_tree;
diff --git a/src/mpi/coll/algorithms/treealgo/treealgo.h b/src/mpi/coll/algorithms/treealgo/treealgo.h
index 60bac96806d..50e473f2b94 100644
--- a/src/mpi/coll/algorithms/treealgo/treealgo.h
+++ b/src/mpi/coll/algorithms/treealgo/treealgo.h
@@ -13,9 +13,10 @@ int MPII_Treealgo_comm_init(MPIR_Comm * comm);
 int MPII_Treealgo_comm_cleanup(MPIR_Comm * comm);
 int MPIR_Treealgo_tree_create(int rank, int nranks, int tree_type, int k, int root,
                               MPIR_Treealgo_tree_t * ct);
-int MPIR_Treealgo_tree_create_topo_aware(MPIR_Comm * comm, int tree_type, int k, int root,
+int MPIR_Treealgo_tree_create_topo_aware(MPIR_Comm * comm, int coll_group, int tree_type,
+                                         int k, int root,
                                          bool enable_reorder, MPIR_Treealgo_tree_t * ct);
-int MPIR_Treealgo_tree_create_topo_wave(MPIR_Comm * comm, int k, int root,
+int MPIR_Treealgo_tree_create_topo_wave(MPIR_Comm * comm, int coll_group, int k, int root,
                                         bool enable_reorder, int overhead, int lat_diff_groups,
                                         int lat_diff_switches, int lat_same_switches,
                                         MPIR_Treealgo_tree_t * ct);
diff --git a/src/mpi/coll/algorithms/treealgo/treealgo_types.h b/src/mpi/coll/algorithms/treealgo/treealgo_types.h
index bb15947046e..646c63f866b 100644
--- a/src/mpi/coll/algorithms/treealgo/treealgo_types.h
+++ b/src/mpi/coll/algorithms/treealgo/treealgo_types.h
@@ -28,6 +28,7 @@ typedef struct {
 
 typedef struct {
     MPIR_Tree_type_t type;
+    int coll_group;
     int root;
     union {
         struct {
diff --git a/src/mpi/coll/algorithms/treealgo/treeutil.c b/src/mpi/coll/algorithms/treealgo/treeutil.c
index 7b522332b49..1c55d713e41 100644
--- a/src/mpi/coll/algorithms/treealgo/treeutil.c
+++ b/src/mpi/coll/algorithms/treealgo/treeutil.c
@@ -472,8 +472,8 @@ static void MPII_Treeutil_hierarchy_reorder(UT_array * hierarchy, int rank)
 }
 
 /* tree init function is for building hierarchy of MPIR_Process::coords_dims */
-static int MPII_Treeutil_hierarchy_populate(MPIR_Comm * comm, int rank, int nranks, int root,
-                                            bool enable_reorder, UT_array * hierarchy)
+static int MPII_Treeutil_hierarchy_populate(MPIR_Comm * comm, int coll_group, int rank, int nranks,
+                                            int root, bool enable_reorder, UT_array * hierarchy)
 {
     int mpi_errno = MPI_SUCCESS;
 
@@ -504,8 +504,12 @@ static int MPII_Treeutil_hierarchy_populate(MPIR_Comm * comm, int rank, int nran
         MPIR_Assert(upper_level != NULL);
 
         /* Get wrank from the communicator as the coords are stored with wrank */
+        int comm_rank = r;
+        if (coll_group > 0) {
+            comm_rank = comm->subgroups[coll_group].proc_table[r];
+        }
         uint64_t temp = 0;
-        MPID_Comm_get_lpid(comm, r, &temp, FALSE);
+        MPID_Comm_get_lpid(comm, comm_rank, &temp, FALSE);
         int wrank = (int) temp;
         if (wrank < 0)
             goto fn_fail;
@@ -600,12 +604,13 @@ static int MPII_Treeutil_hierarchy_populate(MPIR_Comm * comm, int rank, int nran
  * build the hierarchy of the topology-aware tree.
  * For the mentioned cases  see tags 'goto fn_fallback;'. */
 
-int MPII_Treeutil_tree_topology_aware_init(MPIR_Comm * comm, int k, int root, bool enable_reorder,
-                                           MPIR_Treealgo_tree_t * ct)
+int MPII_Treeutil_tree_topology_aware_init(MPIR_Comm * comm, int coll_group, int k, int root,
+                                           bool enable_reorder, MPIR_Treealgo_tree_t * ct)
 {
     int mpi_errno = MPI_SUCCESS;
-    int rank = comm->rank;
-    int nranks = comm->local_size;
+
+    int rank, nranks;
+    MPIR_COLL_RANK_SIZE(comm, coll_group, rank, nranks);
 
     UT_array hierarchy[MAX_HIERARCHY_DEPTH];
     int dim = MPIR_Process.coords_dims - 1;
@@ -613,7 +618,8 @@ int MPII_Treeutil_tree_topology_aware_init(MPIR_Comm * comm, int k, int root, bo
         tree_ut_hierarchy_init(&hierarchy[dim]);
 
     if (k <= 0 ||
-        0 != MPII_Treeutil_hierarchy_populate(comm, rank, nranks, root, enable_reorder, hierarchy))
+        0 != MPII_Treeutil_hierarchy_populate(comm, coll_group, rank, nranks, root, enable_reorder,
+                                              hierarchy))
         goto fn_fallback;
 
     ct->rank = rank;
@@ -695,16 +701,18 @@ int MPII_Treeutil_tree_topology_aware_init(MPIR_Comm * comm, int k, int root, bo
 }
 
 /* Implementation of 'Topology aware' algorithm with the branching factor k */
-int MPII_Treeutil_tree_topology_aware_k_init(MPIR_Comm * comm, int k, int root, bool enable_reorder,
-                                             MPIR_Treealgo_tree_t * ct)
+int MPII_Treeutil_tree_topology_aware_k_init(MPIR_Comm * comm, int coll_group, int k, int root,
+                                             bool enable_reorder, MPIR_Treealgo_tree_t * ct)
 {
     int mpi_errno = MPI_SUCCESS;
-    int rank = comm->rank;
-    int nranks = comm->local_size;
+
+    int rank, nranks;
+    MPIR_COLL_RANK_SIZE(comm, coll_group, rank, nranks);
 
     /* fall back to MPII_Treeutil_tree_topology_aware_init if k is less or equal to 2 */
     if (k <= 2) {
-        return MPII_Treeutil_tree_topology_aware_init(comm, k, root, enable_reorder, ct);
+        return MPII_Treeutil_tree_topology_aware_init(comm, coll_group, k, root, enable_reorder,
+                                                      ct);
     }
 
     int *num_childrens = NULL;
@@ -719,7 +727,9 @@ int MPII_Treeutil_tree_topology_aware_k_init(MPIR_Comm * comm, int k, int root,
     for (dim = MPIR_Process.coords_dims - 1; dim >= 0; --dim)
         tree_ut_hierarchy_init(&hierarchy[dim]);
 
-    if (0 != MPII_Treeutil_hierarchy_populate(comm, rank, nranks, root, enable_reorder, hierarchy))
+    if (0 !=
+        MPII_Treeutil_hierarchy_populate(comm, coll_group, rank, nranks, root, enable_reorder,
+                                         hierarchy))
         goto fn_fallback;
 
     ct->rank = rank;
@@ -758,7 +768,7 @@ int MPII_Treeutil_tree_topology_aware_k_init(MPIR_Comm * comm, int k, int root,
                 /* Do an allgather to know the current num_children on each rank */
                 MPIR_Errflag_t errflag = MPIR_ERR_NONE;
                 MPIR_Allgather_impl(&(ct->num_children), 1, MPI_INT, num_childrens, 1, MPI_INT,
-                                    comm, MPIR_SUBGROUP_NONE, errflag);
+                                    comm, coll_group, errflag);
                 if (mpi_errno) {
                     goto fn_fail;
                 }
@@ -1111,13 +1121,12 @@ static int init_root_switch(const UT_array * hierarchy, heap_vector * minHeaps,
 }
 
 /* 'Topology Wave' implementation */
-int MPII_Treeutil_tree_topology_wave_init(MPIR_Comm * comm, int k, int root, bool enable_reorder,
-                                          int overhead, int lat_diff_groups, int lat_diff_switches,
-                                          int lat_same_switches, MPIR_Treealgo_tree_t * ct)
+int MPII_Treeutil_tree_topology_wave_init(MPIR_Comm * comm, int coll_group, int k, int root,
+                                          bool enable_reorder, int overhead, int lat_diff_groups,
+                                          int lat_diff_switches, int lat_same_switches,
+                                          MPIR_Treealgo_tree_t * ct)
 {
     int mpi_errno = MPI_SUCCESS;
-    int rank = comm->rank;
-    int nranks = comm->local_size;
     int root_gr_sorted_idx = 0;
     int root_sw_sorted_idx = 0;
     int group_offset = 0;
@@ -1126,6 +1135,9 @@ int MPII_Treeutil_tree_topology_wave_init(MPIR_Comm * comm, int k, int root, boo
     UT_array hierarchy[MAX_HIERARCHY_DEPTH];
     UT_array *unv_set = NULL;
 
+    int rank, nranks;
+    MPIR_COLL_RANK_SIZE(comm, coll_group, rank, nranks);
+
     heap_vector minHeaps;
     heap_vector_init(&minHeaps);
 
@@ -1135,7 +1147,8 @@ int MPII_Treeutil_tree_topology_wave_init(MPIR_Comm * comm, int k, int root, boo
         tree_ut_hierarchy_init(&hierarchy[dim]);
 
     if (overhead <= 0 || lat_diff_groups <= 0 || lat_diff_switches <= 0 || lat_same_switches <= 0 ||
-        0 != MPII_Treeutil_hierarchy_populate(comm, rank, nranks, root, enable_reorder, hierarchy))
+        0 != MPII_Treeutil_hierarchy_populate(comm, coll_group, rank, nranks, root, enable_reorder,
+                                              hierarchy))
         goto fn_fallback;
 
     UT_icd intpair_icd = { sizeof(pair), NULL, NULL, NULL };
diff --git a/src/mpi/coll/algorithms/treealgo/treeutil.h b/src/mpi/coll/algorithms/treealgo/treeutil.h
index c628f162ca6..51864938f4d 100644
--- a/src/mpi/coll/algorithms/treealgo/treeutil.h
+++ b/src/mpi/coll/algorithms/treealgo/treeutil.h
@@ -123,15 +123,16 @@ int MPII_Treeutil_tree_knomial_2_init(int rank, int nranks, int k, int root,
                                       MPIR_Treealgo_tree_t * ct);
 
 /* Generate topology_aware tree information */
-int MPII_Treeutil_tree_topology_aware_init(MPIR_Comm * comm, int k, int root, bool enable_reorder,
-                                           MPIR_Treealgo_tree_t * ct);
+int MPII_Treeutil_tree_topology_aware_init(MPIR_Comm * comm, int coll_group, int k, int root,
+                                           bool enable_reorder, MPIR_Treealgo_tree_t * ct);
 
-int MPII_Treeutil_tree_topology_aware_k_init(MPIR_Comm * comm, int k, int root, bool enable_reorder,
-                                             MPIR_Treealgo_tree_t * ct);
+int MPII_Treeutil_tree_topology_aware_k_init(MPIR_Comm * comm, int coll_group, int k, int root,
+                                             bool enable_reorder, MPIR_Treealgo_tree_t * ct);
 
 /* Generate topology_wave tree information */
-int MPII_Treeutil_tree_topology_wave_init(MPIR_Comm * comm, int k, int root, bool enable_reorder,
-                                          int overhead, int lat_diff_groups, int lat_diff_switches,
-                                          int lat_same_switches, MPIR_Treealgo_tree_t * ct);
+int MPII_Treeutil_tree_topology_wave_init(MPIR_Comm * comm, int coll_group, int k, int root,
+                                          bool enable_reorder, int overhead, int lat_diff_groups,
+                                          int lat_diff_switches, int lat_same_switches,
+                                          MPIR_Treealgo_tree_t * ct);
 
 #endif /* TREEUTIL_H_INCLUDED */
diff --git a/src/mpi/coll/allreduce/allreduce_intra_tree.c b/src/mpi/coll/allreduce/allreduce_intra_tree.c
index 67845f45304..63fe72f3b86 100644
--- a/src/mpi/coll/allreduce/allreduce_intra_tree.c
+++ b/src/mpi/coll/allreduce/allreduce_intra_tree.c
@@ -66,7 +66,7 @@ int MPIR_Allreduce_intra_tree(const void *sendbuf,
     /* initialize the tree */
     if (tree_type == MPIR_TREE_TYPE_TOPOLOGY_AWARE || tree_type == MPIR_TREE_TYPE_TOPOLOGY_AWARE_K) {
         mpi_errno =
-            MPIR_Treealgo_tree_create_topo_aware(comm_ptr, tree_type, k, root,
+            MPIR_Treealgo_tree_create_topo_aware(comm_ptr, coll_group, tree_type, k, root,
                                                  MPIR_CVAR_ALLREDUCE_TOPO_REORDER_ENABLE, &my_tree);
     } else if (tree_type == MPIR_TREE_TYPE_TOPOLOGY_WAVE) {
         MPIR_Csel_coll_sig_s coll_sig = {
@@ -96,7 +96,7 @@ int MPIR_Allreduce_intra_tree(const void *sendbuf,
         }
 
         mpi_errno =
-            MPIR_Treealgo_tree_create_topo_wave(comm_ptr, k, root,
+            MPIR_Treealgo_tree_create_topo_wave(comm_ptr, coll_group, k, root,
                                                 MPIR_CVAR_ALLREDUCE_TOPO_REORDER_ENABLE,
                                                 overhead, lat_diff_groups, lat_diff_switches,
                                                 lat_same_switches, &my_tree);
diff --git a/src/mpi/coll/bcast/bcast_intra_pipelined_tree.c b/src/mpi/coll/bcast/bcast_intra_pipelined_tree.c
index 30ec1939366..84a22bc569d 100644
--- a/src/mpi/coll/bcast/bcast_intra_pipelined_tree.c
+++ b/src/mpi/coll/bcast/bcast_intra_pipelined_tree.c
@@ -75,11 +75,12 @@ int MPIR_Bcast_intra_pipelined_tree(void *buffer,
         if (tree_type == MPIR_TREE_TYPE_TOPOLOGY_AWARE ||
             tree_type == MPIR_TREE_TYPE_TOPOLOGY_AWARE_K) {
             mpi_errno =
-                MPIR_Treealgo_tree_create_topo_aware(comm_ptr, tree_type, branching_factor, root,
+                MPIR_Treealgo_tree_create_topo_aware(comm_ptr, coll_group, tree_type,
+                                                     branching_factor, root,
                                                      MPIR_CVAR_BCAST_TOPO_REORDER_ENABLE, &my_tree);
         } else if (tree_type == MPIR_TREE_TYPE_TOPOLOGY_WAVE) {
             mpi_errno =
-                MPIR_Treealgo_tree_create_topo_wave(comm_ptr, branching_factor, root,
+                MPIR_Treealgo_tree_create_topo_wave(comm_ptr, coll_group, branching_factor, root,
                                                     MPIR_CVAR_BCAST_TOPO_REORDER_ENABLE,
                                                     MPIR_CVAR_BCAST_TOPO_OVERHEAD,
                                                     MPIR_CVAR_BCAST_TOPO_DIFF_GROUPS,
diff --git a/src/mpi/coll/bcast/bcast_intra_tree.c b/src/mpi/coll/bcast/bcast_intra_tree.c
index e9e16a664c4..fe1e1e14b1e 100644
--- a/src/mpi/coll/bcast/bcast_intra_tree.c
+++ b/src/mpi/coll/bcast/bcast_intra_tree.c
@@ -76,7 +76,8 @@ int MPIR_Bcast_intra_tree(void *buffer,
         if (tree_type == MPIR_TREE_TYPE_TOPOLOGY_AWARE ||
             tree_type == MPIR_TREE_TYPE_TOPOLOGY_AWARE_K) {
             mpi_errno =
-                MPIR_Treealgo_tree_create_topo_aware(comm_ptr, tree_type, branching_factor, root,
+                MPIR_Treealgo_tree_create_topo_aware(comm_ptr, coll_group, tree_type,
+                                                     branching_factor, root,
                                                      MPIR_CVAR_BCAST_TOPO_REORDER_ENABLE, &my_tree);
         } else if (tree_type == MPIR_TREE_TYPE_TOPOLOGY_WAVE) {
             MPIR_Csel_coll_sig_s coll_sig = {
@@ -105,7 +106,7 @@ int MPIR_Bcast_intra_tree(void *buffer,
             }
 
             mpi_errno =
-                MPIR_Treealgo_tree_create_topo_wave(comm_ptr, branching_factor, root,
+                MPIR_Treealgo_tree_create_topo_wave(comm_ptr, coll_group, branching_factor, root,
                                                     MPIR_CVAR_BCAST_TOPO_REORDER_ENABLE,
                                                     overhead, lat_diff_groups, lat_diff_switches,
                                                     lat_same_switches, &my_tree);
diff --git a/src/mpi/coll/ireduce/ireduce_tsp_tree.c b/src/mpi/coll/ireduce/ireduce_tsp_tree.c
index 5d221ebf93e..69c582d45ba 100644
--- a/src/mpi/coll/ireduce/ireduce_tsp_tree.c
+++ b/src/mpi/coll/ireduce/ireduce_tsp_tree.c
@@ -70,7 +70,7 @@ int MPIR_TSP_Ireduce_sched_intra_tree(const void *sendbuf, void *recvbuf, MPI_Ai
     my_tree.children = NULL;
     if (tree_type == MPIR_TREE_TYPE_TOPOLOGY_AWARE || tree_type == MPIR_TREE_TYPE_TOPOLOGY_AWARE_K) {
         mpi_errno =
-            MPIR_Treealgo_tree_create_topo_aware(comm, tree_type, k, tree_root,
+            MPIR_Treealgo_tree_create_topo_aware(comm, coll_group, tree_type, k, tree_root,
                                                  MPIR_CVAR_IREDUCE_TOPO_REORDER_ENABLE, &my_tree);
     } else if (tree_type == MPIR_TREE_TYPE_TOPOLOGY_WAVE) {
         MPIR_Csel_coll_sig_s coll_sig = {
@@ -101,7 +101,7 @@ int MPIR_TSP_Ireduce_sched_intra_tree(const void *sendbuf, void *recvbuf, MPI_Ai
         }
 
         mpi_errno =
-            MPIR_Treealgo_tree_create_topo_wave(comm, k, tree_root,
+            MPIR_Treealgo_tree_create_topo_wave(comm, coll_group, k, tree_root,
                                                 MPIR_CVAR_IREDUCE_TOPO_REORDER_ENABLE,
                                                 overhead, lat_diff_groups, lat_diff_switches,
                                                 lat_same_switches, &my_tree);