diff --git a/packages/contact-center/cc-components/src/components/StationLogin/station-login.utils.tsx b/packages/contact-center/cc-components/src/components/StationLogin/station-login.utils.tsx
index 80b0ecd3c..dac2e10c9 100644
--- a/packages/contact-center/cc-components/src/components/StationLogin/station-login.utils.tsx
+++ b/packages/contact-center/cc-components/src/components/StationLogin/station-login.utils.tsx
@@ -1,6 +1,6 @@
 import {useRef} from 'react';
 import {StationLoginLabels} from './constants';
-import {LoginOptions, DESKTOP, DIALNUMBER} from '@webex/cc-store';
+import {LoginOptions, DESKTOP, DIAL_NUMBER} from '@webex/cc-store';
 
 const handleModals = (
   modalRef,
@@ -270,7 +270,7 @@ const handleDNInputChanged = (
       // show error for empty string
       setDNErrorText(`${LoginOptions[selectedDeviceType]} ${StationLoginLabels.IS_REQUIRED}`);
       setShowDNError(true);
-    } else if (selectedDeviceType === DIALNUMBER) {
+    } else if (selectedDeviceType === DIAL_NUMBER) {
       setShowDNError(validateDialNumber(input, dialNumberRegex, setDNErrorText, logger));
     } else {
       setShowDNError(false);
diff --git a/packages/contact-center/cc-components/src/components/task/CallControl/CallControlCustom/call-control-consult.tsx b/packages/contact-center/cc-components/src/components/task/CallControl/CallControlCustom/call-control-consult.tsx
index fdb701de7..1d1ef829e 100644
--- a/packages/contact-center/cc-components/src/components/task/CallControl/CallControlCustom/call-control-consult.tsx
+++ b/packages/contact-center/cc-components/src/components/task/CallControl/CallControlCustom/call-control-consult.tsx
@@ -1,4 +1,4 @@
-import React, {useState} from 'react';
+import React from 'react';
 import {ButtonCircle, TooltipNext, Text} from '@momentum-ui/react-collaboration';
 import {Avatar, Icon} from '@momentum-design/components/dist/react';
 import TaskTimer from '../../TaskTimer';
@@ -6,9 +6,6 @@ import {CallControlConsultComponentsProps} from '../../task.types';
 import {
   createConsultButtons,
   getVisibleButtons,
-  handleTransferPress,
-  handleEndConsultPress,
-  handleMuteToggle,
   getConsultStatusText,
   createTimerKey,
 } from './call-control-custom.utils';
@@ -16,42 +13,26 @@ import {
 const CallControlConsultComponent: React.FC<CallControlConsultComponentsProps> = ({
   agentName,
   startTimeStamp,
-  onTransfer,
+  consultTransfer,
   endConsultCall,
-  consultCompleted,
-  isAgentBeingConsulted,
-  isEndConsultEnabled,
+  consultConference,
+  switchToMainCall,
   logger,
-  muteUnmute,
   isMuted,
-  onToggleConsultMute,
+  controlVisibility,
+  toggleConsultMute,
 }) => {
-  const [isMuteDisabled, setIsMuteDisabled] = useState(false);
-
   const timerKey = createTimerKey(startTimeStamp);
 
-  const handleTransfer = () => {
-    handleTransferPress(onTransfer, logger);
-  };
-
-  const handleEndConsult = () => {
-    handleEndConsultPress(endConsultCall, logger);
-  };
-
-  const handleConsultMuteToggle = () => {
-    handleMuteToggle(onToggleConsultMute, setIsMuteDisabled, logger);
-  };
-
   const buttons = createConsultButtons(
     isMuted,
-    isMuteDisabled,
-    consultCompleted,
-    isAgentBeingConsulted,
-    isEndConsultEnabled,
-    muteUnmute,
-    onTransfer ? handleTransfer : undefined,
-    handleConsultMuteToggle,
-    handleEndConsult
+    controlVisibility,
+    consultTransfer,
+    toggleConsultMute,
+    endConsultCall,
+    consultConference,
+    switchToMainCall,
+    logger
   );
 
   // Filter buttons that should be shown, then map them
@@ -66,7 +47,7 @@ const CallControlConsultComponent: React.FC<CallControlConsultComponentsProps> =
             {agentName}
           </Text>
           <Text tagName="p" type="body-secondary" className="consult-sub-text">
-            {getConsultStatusText(consultCompleted)}&nbsp;&bull;&nbsp;
+            {getConsultStatusText(controlVisibility.isConsultInitiated)}&nbsp;&bull;&nbsp;
             <TaskTimer key={timerKey} startTimeStamp={startTimeStamp} />
           </Text>
         </div>
diff --git a/packages/contact-center/cc-components/src/components/task/CallControl/CallControlCustom/call-control-custom.utils.ts b/packages/contact-center/cc-components/src/components/task/CallControl/CallControlCustom/call-control-custom.utils.ts
index 3c0edccbf..3180414db 100644
--- a/packages/contact-center/cc-components/src/components/task/CallControl/CallControlCustom/call-control-custom.utils.ts
+++ b/packages/contact-center/cc-components/src/components/task/CallControl/CallControlCustom/call-control-custom.utils.ts
@@ -1,18 +1,6 @@
 import {BuddyDetails, ContactServiceQueue, ILogger} from '@webex/cc-store';
 import {MUTE_CALL, UNMUTE_CALL} from '../../constants';
-
-/**
- * Interface for button configuration
- */
-export interface ButtonConfig {
-  key: string;
-  icon: string;
-  onClick: () => void;
-  tooltip: string;
-  className: string;
-  disabled?: boolean;
-  shouldShow: boolean;
-}
+import {ButtonConfig, ControlVisibility} from '../../task.types';
 
 /**
  * Interface for list item data
@@ -27,14 +15,12 @@ export interface ListItemData {
  */
 export const createConsultButtons = (
   isMuted: boolean,
-  isMuteDisabled: boolean,
-  consultCompleted: boolean,
-  isAgentBeingConsulted: boolean,
-  isEndConsultEnabled: boolean,
-  muteUnmute: boolean,
-  onTransfer?: () => void,
-  handleConsultMuteToggle?: () => void,
-  handleEndConsult?: () => void,
+  controlVisibility: ControlVisibility,
+  consultTransfer: () => void,
+  toggleConsultMute: () => void,
+  endConsultCall: () => void,
+  consultConference: () => void,
+  switchToMainCall: () => void,
   logger?
 ): ButtonConfig[] => {
   try {
@@ -42,28 +28,46 @@ export const createConsultButtons = (
       {
         key: 'mute',
         icon: isMuted ? 'microphone-muted-bold' : 'microphone-bold',
-        onClick: handleConsultMuteToggle || (() => {}),
+        onClick: toggleConsultMute,
         tooltip: isMuted ? UNMUTE_CALL : MUTE_CALL,
         className: `${isMuted ? 'call-control-button-muted' : 'call-control-button'}`,
-        disabled: isMuteDisabled,
-        shouldShow: muteUnmute,
+        disabled: !controlVisibility.muteUnmuteConsult.isEnabled,
+        isVisible: controlVisibility.muteUnmuteConsult.isVisible,
+      },
+      {
+        key: 'switchToMainCall',
+        icon: 'call-swap-bold',
+        tooltip: controlVisibility.isConferenceInProgress ? 'Switch to Conference Call' : 'Switch to Call',
+        onClick: switchToMainCall,
+        className: 'call-control-button',
+        disabled: !controlVisibility.switchToMainCall.isEnabled,
+        isVisible: controlVisibility.switchToMainCall.isVisible,
       },
       {
         key: 'transfer',
         icon: 'next-bold',
-        tooltip: 'Transfer Consult',
-        onClick: onTransfer || (() => {}),
+        tooltip: controlVisibility.isConferenceInProgress ? 'Transfer Conference' : 'Transfer',
+        onClick: consultTransfer,
         className: 'call-control-button',
-        disabled: !consultCompleted,
-        shouldShow: isAgentBeingConsulted && !!onTransfer,
+        disabled: !controlVisibility.consultTransferConsult.isEnabled,
+        isVisible: controlVisibility.consultTransferConsult.isVisible,
+      },
+      {
+        key: 'conference',
+        icon: 'call-merge-bold',
+        tooltip: 'Merge',
+        onClick: consultConference,
+        className: 'call-control-button',
+        disabled: !controlVisibility.mergeConferenceConsult.isEnabled,
+        isVisible: controlVisibility.mergeConferenceConsult.isVisible,
       },
       {
         key: 'cancel',
         icon: 'headset-muted-bold',
         tooltip: 'End Consult',
-        onClick: handleEndConsult || (() => {}),
+        onClick: endConsultCall,
         className: 'call-control-consult-button-cancel',
-        shouldShow: isEndConsultEnabled || isAgentBeingConsulted,
+        isVisible: controlVisibility.endConsult.isVisible,
       },
     ];
   } catch (error) {
@@ -82,7 +86,7 @@ export const createConsultButtons = (
  */
 export const getVisibleButtons = (buttons: ButtonConfig[], logger?): ButtonConfig[] => {
   try {
-    return buttons.filter((button) => button.shouldShow);
+    return buttons.filter((button) => button.isVisible);
   } catch (error) {
     logger?.error('CC-Widgets: CallControlCustom: Error in getVisibleButtons', {
       module: 'cc-components#call-control-custom.utils.ts',
@@ -116,83 +120,12 @@ export const createInitials = (name: string, logger?): string => {
   }
 };
 
-/**
- * Handles transfer button press with logging
- */
-export const handleTransferPress = (onTransfer: (() => void) | undefined, logger: ILogger): void => {
-  logger.info('CC-Widgets: CallControlConsult: transfer button clicked', {
-    module: 'call-control-consult.tsx',
-    method: 'handleTransfer',
-  });
-
-  try {
-    if (onTransfer) {
-      onTransfer();
-      logger.log('CC-Widgets: CallControlConsult: transfer completed', {
-        module: 'call-control-consult.tsx',
-        method: 'handleTransfer',
-      });
-    }
-  } catch (error) {
-    throw new Error(`Error transferring call: ${error}`);
-  }
-};
-
-/**
- * Handles end consult button press with logging
- */
-export const handleEndConsultPress = (endConsultCall: (() => void) | undefined, logger: ILogger): void => {
-  logger.info('CC-Widgets: CallControlConsult: end consult clicked', {
-    module: 'call-control-consult.tsx',
-    method: 'handleEndConsult',
-  });
-
-  try {
-    if (endConsultCall) {
-      endConsultCall();
-      logger.log('CC-Widgets: CallControlConsult: end consult completed', {
-        module: 'call-control-consult.tsx',
-        method: 'handleEndConsult',
-      });
-    }
-  } catch (error) {
-    throw new Error(`Error ending consult call: ${error}`);
-  }
-};
-
-/**
- * Handles mute toggle with disabled state management
- */
-export const handleMuteToggle = (
-  onToggleConsultMute: (() => void) | undefined,
-  setIsMuteDisabled: (disabled: boolean) => void,
-  logger: ILogger
-): void => {
-  setIsMuteDisabled(true);
-
-  try {
-    if (onToggleConsultMute) {
-      onToggleConsultMute();
-    }
-  } catch (error) {
-    logger.error(`Mute toggle failed: ${error}`, {
-      module: 'call-control-consult.tsx',
-      method: 'handleConsultMuteToggle',
-    });
-  } finally {
-    // Re-enable button after operation
-    setTimeout(() => {
-      setIsMuteDisabled(false);
-    }, 500);
-  }
-};
-
 /**
  * Gets the consult status text based on completion state
  */
-export const getConsultStatusText = (consultCompleted: boolean, logger?): string => {
+export const getConsultStatusText = (consultInitiated: boolean, logger?): string => {
   try {
-    return consultCompleted ? 'Consulting' : 'Consult requested';
+    return consultInitiated ? 'Consult requested' : 'Consulting';
   } catch (error) {
     logger?.error('CC-Widgets: CallControlCustom: Error in getConsultStatusText', {
       module: 'cc-components#call-control-custom.utils.ts',
@@ -292,7 +225,8 @@ export const handleTabSelection = (key: string, setSelectedTab: (tab: string) =>
 export const handleAgentSelection = (
   agentId: string,
   agentName: string,
-  onAgentSelect: ((agentId: string, agentName: string) => void) | undefined,
+  allowParticipantsToInteract: boolean,
+  onAgentSelect: ((agentId: string, agentName: string, allowParticipantsToInteract: boolean) => void) | undefined,
   logger: ILogger
 ): void => {
   try {
@@ -301,7 +235,7 @@ export const handleAgentSelection = (
       method: 'onAgentSelect',
     });
     if (onAgentSelect) {
-      onAgentSelect(agentId, agentName);
+      onAgentSelect(agentId, agentName, allowParticipantsToInteract);
     }
   } catch (error) {
     logger.error(`CC-Widgets: CallControlCustom: Error in handleAgentSelection: ${error.message}`, {
@@ -317,7 +251,8 @@ export const handleAgentSelection = (
 export const handleQueueSelection = (
   queueId: string,
   queueName: string,
-  onQueueSelect: ((queueId: string, queueName: string) => void) | undefined,
+  allowParticipantsToInteract: boolean,
+  onQueueSelect: ((queueId: string, queueName: string, allowParticipantsToInteract: boolean) => void) | undefined,
   logger: ILogger
 ): void => {
   try {
@@ -326,7 +261,7 @@ export const handleQueueSelection = (
       method: 'onQueueSelect',
     });
     if (onQueueSelect) {
-      onQueueSelect(queueId, queueName);
+      onQueueSelect(queueId, queueName, allowParticipantsToInteract);
     }
   } catch (error) {
     logger.error(`CC-Widgets: CallControlCustom: Error in handleQueueSelection: ${error.message}`, {
@@ -684,10 +619,11 @@ export const debounce = <T extends (...args: unknown[]) => unknown>(
 export const shouldAddConsultTransferAction = (
   selectedCategory: string,
   isEntryPointTabVisible: boolean,
+  allowParticipantsToInteract: boolean,
   query: string,
   entryPoints: {id: string; name: string}[],
-  onDialNumberSelect: ((dialNumber: string) => void) | undefined,
-  onEntryPointSelect: ((entryPointId: string, entryPointName: string) => void) | undefined
+  onDialNumberSelect: (dialNumber: string, allowParticipantsToInteract: boolean) => void,
+  onEntryPointSelect: (entryPointId: string, entryPointName: string, allowParticipantsToInteract: boolean) => void
 ): {visible: boolean; onClick?: () => void; title?: string} => {
   const DN_REGEX = new RegExp('^[+1][0-9]{3,18}$|^[*#:][+1][0-9*#:]{3,18}$|^[0-9*#:]{3,18}$');
 
@@ -697,14 +633,18 @@ export const shouldAddConsultTransferAction = (
 
   if (isDial) {
     return valid && onDialNumberSelect
-      ? {visible: true, onClick: () => onDialNumberSelect(query), title: query}
+      ? {visible: true, onClick: () => onDialNumberSelect(query, allowParticipantsToInteract), title: query}
       : {visible: false};
   }
 
   if (isEntry) {
     const match = query ? entryPoints?.find((e) => e.name === query || e.id === query) : null;
     return valid && match && onEntryPointSelect
-      ? {visible: true, onClick: () => onEntryPointSelect(match.id, match.name), title: match.name}
+      ? {
+          visible: true,
+          onClick: () => onEntryPointSelect(match.id, match.name, allowParticipantsToInteract),
+          title: match.name,
+        }
       : {visible: false};
   }
 
diff --git a/packages/contact-center/cc-components/src/components/task/CallControl/CallControlCustom/consult-transfer-popover.tsx b/packages/contact-center/cc-components/src/components/task/CallControl/CallControlCustom/consult-transfer-popover.tsx
index dd43968cf..822aba8ba 100644
--- a/packages/contact-center/cc-components/src/components/task/CallControl/CallControlCustom/consult-transfer-popover.tsx
+++ b/packages/contact-center/cc-components/src/components/task/CallControl/CallControlCustom/consult-transfer-popover.tsx
@@ -1,6 +1,6 @@
-import React from 'react';
+import React, {useState} from 'react';
 import {Text, ListNext, TextInput, Button, ButtonCircle, TooltipNext} from '@momentum-ui/react-collaboration';
-import {Icon} from '@momentum-design/components/dist/react';
+import {Icon, Checkbox} from '@momentum-design/components/dist/react';
 import ConsultTransferListComponent from './consult-transfer-list-item';
 import {ConsultTransferPopoverComponentProps} from '../../task.types';
 import ConsultTransferEmptyState from './consult-transfer-empty-state';
@@ -11,6 +11,7 @@ import {
   getAgentsForDisplay,
 } from './call-control-custom.utils';
 import {useConsultTransferPopover} from './consult-transfer-popover-hooks';
+
 import {
   SEARCH_PLACEHOLDER,
   CLEAR_SEARCH,
@@ -35,6 +36,7 @@ const ConsultTransferPopoverComponent: React.FC<ConsultTransferPopoverComponentP
   onEntryPointSelect,
   allowConsultToQueue,
   consultTransferOptions,
+  isConferenceInProgress,
   logger,
 }) => {
   const {showDialNumberTab = true, showEntryPointTab = true} = consultTransferOptions || {};
@@ -65,7 +67,7 @@ const ConsultTransferPopoverComponent: React.FC<ConsultTransferPopoverComponentP
     getQueues,
     logger,
   });
-
+  const [allowParticipantsToInteract, setAllowParticipantsToInteract] = useState<boolean>(false);
   const renderList = <T extends {id: string; name: string; number?: string}>(
     items: T[],
     onButtonPress: (item: T) => void
@@ -97,6 +99,7 @@ const ConsultTransferPopoverComponent: React.FC<ConsultTransferPopoverComponentP
   const consultTransferManualAction = shouldAddConsultTransferAction(
     selectedCategory,
     isEntryPointTabVisible,
+    allowParticipantsToInteract,
     searchQuery,
     entryPoints,
     onDialNumberSelect,
@@ -194,105 +197,117 @@ const ConsultTransferPopoverComponent: React.FC<ConsultTransferPopoverComponentP
         )}
       </div>
 
-      {selectedCategory === 'Agents' &&
-        (getAgentsForDisplay(selectedCategory, buddyAgents, searchQuery).length === 0 ? (
-          <ConsultTransferEmptyState message={NO_DATA_AVAILABLE_CONSULT_TRANSFER} />
-        ) : (
-          renderList(
-            getAgentsForDisplay(selectedCategory, buddyAgents, searchQuery).map((agent) => ({
-              id: agent.agentId,
-              name: agent.agentName,
-            })),
-            (item) => handleAgentSelection(item.id, item.name, onAgentSelect, logger)
-          )
-        ))}
+      <div className="consult-list-container">
+        {selectedCategory === 'Agents' &&
+          (getAgentsForDisplay(selectedCategory, buddyAgents, searchQuery).length === 0 ? (
+            <ConsultTransferEmptyState message={NO_DATA_AVAILABLE_CONSULT_TRANSFER} />
+          ) : (
+            renderList(
+              getAgentsForDisplay(selectedCategory, buddyAgents, searchQuery).map((agent) => ({
+                id: agent.agentId,
+                name: agent.agentName,
+              })),
+              (item) => handleAgentSelection(item.id, item.name, allowParticipantsToInteract, onAgentSelect, logger)
+            )
+          ))}
 
-      {selectedCategory === 'Queues' &&
-        (noQueues ? (
-          <ConsultTransferEmptyState message={NO_DATA_AVAILABLE_CONSULT_TRANSFER} />
-        ) : (
-          <div>
-            {renderList(
-              queuesData.map((q) => ({id: q.id, name: q.name})),
-              (item) => handleQueueSelection(item.id, item.name, onQueueSelect, logger)
-            )}
-            {hasMoreQueues && (
-              <div ref={loadMoreRef} className="consult-load-more">
-                {loadingQueues ? (
-                  <Text tagName="small" type="body-secondary">
-                    {LOADING_MORE_QUEUES}
-                  </Text>
-                ) : (
-                  <Text tagName="small" type="body-secondary">
-                    {SCROLL_TO_LOAD_MORE}
-                  </Text>
-                )}
-              </div>
-            )}
-          </div>
-        ))}
+        {selectedCategory === 'Queues' &&
+          (noQueues ? (
+            <ConsultTransferEmptyState message={NO_DATA_AVAILABLE_CONSULT_TRANSFER} />
+          ) : (
+            <div>
+              {renderList(
+                queuesData.map((q) => ({id: q.id, name: q.name})),
+                (item) => handleQueueSelection(item.id, item.name, allowParticipantsToInteract, onQueueSelect, logger)
+              )}
+              {hasMoreQueues && (
+                <div ref={loadMoreRef} className="consult-load-more">
+                  {loadingQueues ? (
+                    <Text tagName="small" type="body-secondary">
+                      {LOADING_MORE_QUEUES}
+                    </Text>
+                  ) : (
+                    <Text tagName="small" type="body-secondary">
+                      {SCROLL_TO_LOAD_MORE}
+                    </Text>
+                  )}
+                </div>
+              )}
+            </div>
+          ))}
 
-      {showDialNumberTab &&
-        selectedCategory === CATEGORY_DIAL_NUMBER &&
-        (noDialNumbers ? (
-          <ConsultTransferEmptyState message={NO_DATA_AVAILABLE_CONSULT_TRANSFER} />
-        ) : (
-          <div>
-            {renderList(
-              dialNumbers.map((d) => ({id: d.id, name: d.name, number: d.number})),
-              (item) => {
-                if (item.number) {
-                  if (onDialNumberSelect) {
-                    onDialNumberSelect(item.number);
+        {showDialNumberTab &&
+          selectedCategory === CATEGORY_DIAL_NUMBER &&
+          (noDialNumbers ? (
+            <ConsultTransferEmptyState message={NO_DATA_AVAILABLE_CONSULT_TRANSFER} />
+          ) : (
+            <div>
+              {renderList(
+                dialNumbers.map((d) => ({id: d.id, name: d.name, number: d.number})),
+                (item) => {
+                  if (item.number) {
+                    onDialNumberSelect(item.number, allowParticipantsToInteract);
                   }
                 }
-              }
-            )}
-            {hasMoreDialNumbers && (
-              <div ref={loadMoreRef} className="consult-load-more">
-                {loadingDialNumbers ? (
-                  <Text tagName="small" type="body-secondary">
-                    {LOADING_MORE_DIAL_NUMBERS}
-                  </Text>
-                ) : (
-                  <Text tagName="small" type="body-secondary">
-                    {SCROLL_TO_LOAD_MORE}
-                  </Text>
-                )}
-              </div>
-            )}
-          </div>
-        ))}
+              )}
+              {hasMoreDialNumbers && (
+                <div ref={loadMoreRef} className="consult-load-more">
+                  {loadingDialNumbers ? (
+                    <Text tagName="small" type="body-secondary">
+                      {LOADING_MORE_DIAL_NUMBERS}
+                    </Text>
+                  ) : (
+                    <Text tagName="small" type="body-secondary">
+                      {SCROLL_TO_LOAD_MORE}
+                    </Text>
+                  )}
+                </div>
+              )}
+            </div>
+          ))}
 
-      {isEntryPointTabVisible &&
-        selectedCategory === CATEGORY_ENTRY_POINT &&
-        (noEntryPoints ? (
-          <ConsultTransferEmptyState message={NO_DATA_AVAILABLE_CONSULT_TRANSFER} />
-        ) : (
-          <div>
-            {renderList(
-              entryPoints.map((e) => ({id: e.id, name: e.name})),
-              (item) => {
-                if (onEntryPointSelect) {
-                  onEntryPointSelect(item.id, item.name);
+        {isEntryPointTabVisible &&
+          selectedCategory === CATEGORY_ENTRY_POINT &&
+          (noEntryPoints ? (
+            <ConsultTransferEmptyState message={NO_DATA_AVAILABLE_CONSULT_TRANSFER} />
+          ) : (
+            <div>
+              {renderList(
+                entryPoints.map((e) => ({id: e.id, name: e.name})),
+                (item) => {
+                  onEntryPointSelect(item.id, item.name, allowParticipantsToInteract);
                 }
-              }
-            )}
-            {hasMoreEntryPoints && (
-              <div ref={loadMoreRef} className="consult-load-more">
-                {loadingEntryPoints ? (
-                  <Text tagName="small" type="body-secondary">
-                    {LOADING_MORE_ENTRY_POINTS}
-                  </Text>
-                ) : (
-                  <Text tagName="small" type="body-secondary">
-                    {SCROLL_TO_LOAD_MORE}
-                  </Text>
-                )}
-              </div>
-            )}
-          </div>
-        ))}
+              )}
+              {hasMoreEntryPoints && (
+                <div ref={loadMoreRef} className="consult-load-more">
+                  {loadingEntryPoints ? (
+                    <Text tagName="small" type="body-secondary">
+                      {LOADING_MORE_ENTRY_POINTS}
+                    </Text>
+                  ) : (
+                    <Text tagName="small" type="body-secondary">
+                      {SCROLL_TO_LOAD_MORE}
+                    </Text>
+                  )}
+                </div>
+              )}
+            </div>
+          ))}
+      </div>
+      {isConferenceInProgress && (
+        <div className="consult-checkbox-container">
+          <Checkbox
+            checked={allowParticipantsToInteract}
+            aria-label="Allow participants to continue interacting"
+            id="allow-participants-checkbox"
+            label="Allow participants to continue interacting."
+            // @ts-expect-error: TODO: https://github.com/momentum-design/momentum-design/pull/1118
+            onchange={() => {
+              setAllowParticipantsToInteract(!allowParticipantsToInteract);
+            }}
+          />
+        </div>
+      )}
     </div>
   );
 };
diff --git a/packages/contact-center/cc-components/src/components/task/CallControl/call-control.styles.scss b/packages/contact-center/cc-components/src/components/task/CallControl/call-control.styles.scss
index 4c362f71f..1b1df41b4 100644
--- a/packages/contact-center/cc-components/src/components/task/CallControl/call-control.styles.scss
+++ b/packages/contact-center/cc-components/src/components/task/CallControl/call-control.styles.scss
@@ -270,6 +270,20 @@
       justify-content: center;
       align-items: center;
     }
+
+    .consult-list-container {
+      flex: 1;
+      overflow-y: auto;
+      max-height: 15rem; /* Limit height to ensure checkbox remains visible */
+      min-height: 15rem;
+      margin-bottom: 1rem;
+    }
+
+    .consult-checkbox-container {
+      padding-top: 1rem;
+      margin-top: auto; /* Push to bottom if there's extra space */
+      flex-shrink: 0; /* Don't allow shrinking */
+    }
   }
 
   .agent-tablist {
diff --git a/packages/contact-center/cc-components/src/components/task/CallControl/call-control.tsx b/packages/contact-center/cc-components/src/components/task/CallControl/call-control.tsx
index ae4214fe8..9eb5c8f0d 100644
--- a/packages/contact-center/cc-components/src/components/task/CallControl/call-control.tsx
+++ b/packages/contact-center/cc-components/src/components/task/CallControl/call-control.tsx
@@ -42,19 +42,18 @@ function CallControlComponent(props: CallControlComponentProps) {
     endCall,
     wrapupCall,
     wrapupCodes,
-    isHeld,
-    setIsHeld,
     isRecording,
     setIsRecording,
     buddyAgents,
     loadBuddyAgents,
     transferCall,
     consultCall,
-    consultInitiated,
-    consultAccepted,
+    exitConference,
+    switchToConsult,
+    consultConference,
+    consultTransfer,
     callControlAudio,
     setConsultAgentName,
-    setConsultAgentId,
     allowConsultToQueue,
     setLastTargetType,
     controlVisibility,
@@ -68,11 +67,11 @@ function CallControlComponent(props: CallControlComponentProps) {
   } = props;
 
   useEffect(() => {
-    updateCallStateFromTask(currentTask, setIsHeld, setIsRecording, logger);
+    updateCallStateFromTask(currentTask, setIsRecording, logger);
   }, [currentTask, logger]);
 
   const handletoggleHold = () => {
-    handleToggleHoldUtil(isHeld, toggleHold, setIsHeld, logger);
+    handleToggleHoldUtil(controlVisibility.isHeld, toggleHold, logger);
   };
 
   const handleMuteToggle = () => {
@@ -94,15 +93,20 @@ function CallControlComponent(props: CallControlComponentProps) {
     handleWrapupChangeUtil(text, value, setSelectedWrapupReason, setSelectedWrapupId, logger);
   };
 
-  const handleTargetSelect = (id: string, name: string, type: DestinationType) => {
+  const handleTargetSelect = (
+    id: string,
+    name: string,
+    type: DestinationType,
+    allowParticipantsToInteract: boolean
+  ) => {
     handleTargetSelectUtil(
       id,
       name,
       type,
+      allowParticipantsToInteract,
       agentMenuType,
       consultCall,
       transferCall,
-      setConsultAgentId,
       setConsultAgentName,
       setLastTargetType,
       logger
@@ -120,7 +124,6 @@ function CallControlComponent(props: CallControlComponentProps) {
 
   const buttons = buildCallControlButtons(
     isMuted,
-    isHeld,
     isRecording,
     isMuteButtonDisabled,
     currentMediaType,
@@ -129,10 +132,18 @@ function CallControlComponent(props: CallControlComponentProps) {
     handletoggleHold,
     toggleRecording,
     endCall,
-    logger
+    exitConference,
+    switchToConsult,
+    consultTransfer,
+    consultConference
   );
 
-  const filteredButtons = filterButtonsForConsultation(buttons, consultInitiated, isTelephony, logger);
+  const filteredButtons = filterButtonsForConsultation(
+    buttons,
+    controlVisibility.isConsultInitiatedOrAccepted,
+    isTelephony,
+    logger
+  );
 
   if (!currentTask) return null;
 
@@ -144,7 +155,7 @@ function CallControlComponent(props: CallControlComponentProps) {
         autoPlay
       ></audio>
       <div className="call-control-container" data-testid="call-control-container">
-        {!(consultAccepted && isTelephony) && !controlVisibility.wrapup && (
+        {!controlVisibility.isConsultReceived && !controlVisibility.wrapup.isVisible && (
           <div className="button-group">
             {filteredButtons.map((button, index) => {
               if (!button.isVisible) return null;
@@ -188,7 +199,7 @@ function CallControlComponent(props: CallControlComponentProps) {
                           <ButtonCircle
                             className={button.className}
                             aria-label={button.tooltip}
-                            disabled={button.disabled || (consultInitiated && isTelephony)}
+                            disabled={button.disabled}
                             data-testid={button.dataTestId}
                           >
                             <Icon className={button.className + '-icon'} name={button.icon} />
@@ -213,12 +224,18 @@ function CallControlComponent(props: CallControlComponentProps) {
                         getAddressBookEntries={getAddressBookEntries}
                         getEntryPoints={getEntryPoints}
                         getQueues={getQueuesFetcher}
-                        onAgentSelect={(agentId, agentName) => handleTargetSelect(agentId, agentName, 'agent')}
-                        onQueueSelect={(queueId, queueName) => handleTargetSelect(queueId, queueName, 'queue')}
-                        onEntryPointSelect={(entryPointId, entryPointName) =>
-                          handleTargetSelect(entryPointId, entryPointName, 'entryPoint')
+                        onAgentSelect={(agentId, agentName, allowParticipantsToInteract) =>
+                          handleTargetSelect(agentId, agentName, 'agent', allowParticipantsToInteract)
+                        }
+                        onQueueSelect={(queueId, queueName, allowParticipantsToInteract) =>
+                          handleTargetSelect(queueId, queueName, 'queue', allowParticipantsToInteract)
+                        }
+                        onEntryPointSelect={(entryPointId, entryPointName, allowParticipantsToInteract) =>
+                          handleTargetSelect(entryPointId, entryPointName, 'entryPoint', allowParticipantsToInteract)
+                        }
+                        onDialNumberSelect={(dialNumber, allowParticipantsToInteract) =>
+                          handleTargetSelect(dialNumber, dialNumber, 'dialNumber', allowParticipantsToInteract)
                         }
-                        onDialNumberSelect={(dialNumber) => handleTargetSelect(dialNumber, dialNumber, 'dialNumber')}
                         allowConsultToQueue={allowConsultToQueue}
                         consultTransferOptions={
                           isTelephony
@@ -229,6 +246,7 @@ function CallControlComponent(props: CallControlComponentProps) {
                                 showEntryPointTab: false,
                               }
                         }
+                        isConferenceInProgress={controlVisibility.isConferenceInProgress}
                         logger={logger}
                       />
                     ) : null}
@@ -240,13 +258,10 @@ function CallControlComponent(props: CallControlComponentProps) {
                   key={index}
                   triggerComponent={
                     <ButtonCircle
-                      className={
-                        button.className +
-                        (button.disabled || (consultInitiated && isTelephony) ? ` ${button.className}-disabled` : '')
-                      }
+                      className={button.className + (button.disabled ? ` ${button.className}-disabled` : '')}
                       data-testid={button.dataTestId}
                       onPress={button.onClick}
-                      disabled={button.disabled || (consultInitiated && isTelephony)}
+                      disabled={button.disabled}
                       aria-label={button.tooltip}
                     >
                       <Icon className={button.className + '-icon'} name={button.icon} />
@@ -265,7 +280,7 @@ function CallControlComponent(props: CallControlComponentProps) {
             })}
           </div>
         )}
-        {controlVisibility.wrapup && (
+        {controlVisibility.wrapup.isVisible && (
           <div className="wrapup-group">
             <PopoverNext
               color="primary"
diff --git a/packages/contact-center/cc-components/src/components/task/CallControl/call-control.utils.ts b/packages/contact-center/cc-components/src/components/task/CallControl/call-control.utils.ts
index dc1c47909..778725954 100644
--- a/packages/contact-center/cc-components/src/components/task/CallControl/call-control.utils.ts
+++ b/packages/contact-center/cc-components/src/components/task/CallControl/call-control.utils.ts
@@ -22,19 +22,13 @@ import {
 /**
  * Handles toggle hold functionality
  */
-export const handleToggleHold = (
-  isHeld: boolean,
-  toggleHold: (hold: boolean) => void,
-  setIsHeld: (held: boolean) => void,
-  logger: ILogger
-): void => {
+export const handleToggleHold = (isHeld: boolean, toggleHold: (hold: boolean) => void, logger: ILogger): void => {
   try {
     logger.info(`CC-Widgets: CallControl: is Call On Hold status is ${isHeld}`, {
       module: 'call-control.tsx',
       method: 'handletoggleHold',
     });
     toggleHold(!isHeld);
-    setIsHeld(!isHeld);
   } catch (error) {
     logger?.error(`CC-Widgets: CallControl: Error in handleToggleHold - ${error.message}`);
   }
@@ -120,10 +114,10 @@ export const handleTargetSelect = (
   id: string,
   name: string,
   type: DestinationType,
+  allowParticipantsToInteract: boolean,
   agentMenuType: CallControlMenuType | null,
-  consultCall: (id: string, type: DestinationType) => void,
+  consultCall: (id: string, type: DestinationType, allowParticipantsToInteract: boolean) => void,
   transferCall: (id: string, type: DestinationType) => void,
-  setConsultAgentId: (id: string) => void,
   setConsultAgentName: (name: string) => void,
   setLastTargetType: (type: DestinationType) => void,
   logger: ILogger
@@ -134,8 +128,7 @@ export const handleTargetSelect = (
   });
   if (agentMenuType === 'Consult') {
     try {
-      consultCall(id, type);
-      setConsultAgentId(id);
+      consultCall(id, type, allowParticipantsToInteract);
       setConsultAgentName(name);
       setLastTargetType(type);
     } catch (error) {
@@ -198,7 +191,6 @@ export const isTelephonyMediaType = (mediaType: MediaChannelType, logger?): bool
  */
 export const buildCallControlButtons = (
   isMuted: boolean,
-  isHeld: boolean,
   isRecording: boolean,
   isMuteButtonDisabled: boolean,
   currentMediaType: MediaTypeInfo,
@@ -207,7 +199,11 @@ export const buildCallControlButtons = (
   handleToggleHoldFunc: () => void,
   toggleRecording: () => void,
   endCall: () => void,
-  logger?
+  exitConference: () => void,
+  switchToConsult: () => void,
+  onTransferConsult: () => void,
+  handleConsultConferencePress: () => void,
+  logger?: ILogger
 ): CallControlButton[] => {
   try {
     return [
@@ -218,17 +214,28 @@ export const buildCallControlButtons = (
         tooltip: isMuted ? UNMUTE_CALL : MUTE_CALL,
         className: `${isMuted ? 'call-control-button-muted' : 'call-control-button'}`,
         disabled: isMuteButtonDisabled,
-        isVisible: controlVisibility.muteUnmute,
+        isVisible: controlVisibility.muteUnmute.isVisible,
         dataTestId: 'call-control:mute-toggle',
       },
+      {
+        id: 'switchToConsult',
+        icon: 'call-swap-bold',
+        tooltip: 'Switch to Consult Call',
+        className: 'call-control-button',
+        onClick: switchToConsult,
+        disabled: !controlVisibility.switchToConsult.isEnabled,
+        isVisible: controlVisibility.switchToConsult.isVisible,
+        dataTestId: 'call-control:switch-to-consult',
+      },
+
       {
         id: 'hold',
-        icon: isHeld ? 'play-bold' : 'pause-bold',
+        icon: controlVisibility.isHeld ? 'play-bold' : 'pause-bold',
         onClick: handleToggleHoldFunc,
-        tooltip: isHeld ? RESUME_CALL : HOLD_CALL,
+        tooltip: controlVisibility.isHeld ? RESUME_CALL : HOLD_CALL,
         className: 'call-control-button',
-        disabled: false,
-        isVisible: controlVisibility.holdResume,
+        disabled: !controlVisibility.holdResume.isEnabled,
+        isVisible: controlVisibility.holdResume.isVisible,
         dataTestId: 'call-control:hold-toggle',
       },
       {
@@ -236,19 +243,37 @@ export const buildCallControlButtons = (
         icon: 'headset-bold',
         tooltip: CONSULT_AGENT,
         className: 'call-control-button',
-        disabled: false,
+        disabled: !controlVisibility.consult.isEnabled,
         menuType: 'Consult',
-        isVisible: controlVisibility.consult,
+        isVisible: controlVisibility.consult.isVisible,
         dataTestId: 'call-control:consult',
       },
+      {
+        id: 'transferConsult',
+        icon: 'next-bold',
+        tooltip: controlVisibility.isConferenceInProgress ? 'Transfer Conference' : 'Transfer',
+        onClick: onTransferConsult || (() => {}),
+        className: 'call-control-button',
+        disabled: !controlVisibility.consultTransfer.isEnabled,
+        isVisible: controlVisibility.consultTransfer.isVisible && !!onTransferConsult,
+      },
+      {
+        id: 'conference',
+        icon: 'webex-teams-bold',
+        tooltip: 'conference',
+        onClick: handleConsultConferencePress || (() => {}),
+        className: 'call-control-button',
+        disabled: !controlVisibility.mergeConference.isEnabled,
+        isVisible: controlVisibility.mergeConference.isVisible && !!handleConsultConferencePress,
+      },
       {
         id: 'transfer',
         icon: 'next-bold',
         tooltip: `${TRANSFER} ${currentMediaType.labelName}`,
         className: 'call-control-button',
-        disabled: false,
+        disabled: !controlVisibility.transfer.isEnabled,
         menuType: 'Transfer',
-        isVisible: controlVisibility.transfer,
+        isVisible: controlVisibility.transfer.isVisible,
         dataTestId: 'call-control:transfer',
       },
       {
@@ -257,18 +282,28 @@ export const buildCallControlButtons = (
         onClick: toggleRecording,
         tooltip: isRecording ? PAUSE_RECORDING : RESUME_RECORDING,
         className: 'call-control-button',
-        disabled: false,
-        isVisible: controlVisibility.pauseResumeRecording,
+        disabled: !controlVisibility.pauseResumeRecording.isEnabled,
+        isVisible: controlVisibility.pauseResumeRecording.isVisible,
         dataTestId: 'call-control:recording-toggle',
       },
+      {
+        id: 'exitConference',
+        icon: 'exit-room-bold',
+        tooltip: 'Exit Conference',
+        className: 'call-control-button-muted',
+        onClick: exitConference,
+        disabled: !controlVisibility.exitConference.isEnabled,
+        isVisible: controlVisibility.exitConference.isVisible,
+        dataTestId: 'call-control:exit-conference',
+      },
       {
         id: 'end',
         icon: 'cancel-regular',
         onClick: endCall,
         tooltip: `${END} ${currentMediaType.labelName}`,
         className: 'call-control-button-cancel',
-        disabled: isHeld,
-        isVisible: controlVisibility.end,
+        disabled: !controlVisibility.end.isEnabled,
+        isVisible: controlVisibility.end.isVisible,
         dataTestId: 'call-control:end-call',
       },
     ];
@@ -312,17 +347,14 @@ export const filterButtonsForConsultation = (
  */
 export const updateCallStateFromTask = (
   currentTask: ITask,
-  setIsHeld: (held: boolean) => void,
   setIsRecording: (recording: boolean) => void,
   logger?
 ): void => {
   try {
     if (!currentTask || !currentTask.data || !currentTask.data.interaction) return;
 
-    const {interaction, mediaResourceId} = currentTask.data;
-    const {media, callProcessingDetails} = interaction;
-    const isHold = media && media[mediaResourceId] && media[mediaResourceId].isHold;
-    setIsHeld(isHold);
+    const {interaction} = currentTask.data;
+    const {callProcessingDetails} = interaction;
 
     if (callProcessingDetails) {
       const {isPaused} = callProcessingDetails;
diff --git a/packages/contact-center/cc-components/src/components/task/CallControlCAD/call-control-cad.styles.scss b/packages/contact-center/cc-components/src/components/task/CallControlCAD/call-control-cad.styles.scss
index abd032830..d6f5e2b57 100644
--- a/packages/contact-center/cc-components/src/components/task/CallControlCAD/call-control-cad.styles.scss
+++ b/packages/contact-center/cc-components/src/components/task/CallControlCAD/call-control-cad.styles.scss
@@ -79,11 +79,48 @@
 }
 
 .call-details {
+  display: flex;
+  gap: 0.25rem;
+}
+
+.call-details-row {
   display: flex;
   align-items: center;
   gap: 0.5rem;
 }
 
+.vertical-divider {
+  width: 0.0625rem;
+  height: 0.75rem;
+  background-color: var(--mds-color-theme-outline-secondary-normal);
+  margin: 0 0.25rem;
+  opacity: 1;
+}
+
+.participants-section {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.participants-indicator {
+  display: flex;
+  align-items: center;
+  gap: 0.25rem;
+}
+
+.participants-icon {
+  color: var(--mds-color-theme-text-primary-normal);
+}
+
+.participants-count {
+  font-size: 0.875rem;
+  color: var(--mds-color-theme-text-primary-normal);
+  white-space: nowrap;
+}
+
+
+
 .call-status {
   display: flex;
   align-items: center;
@@ -211,4 +248,19 @@
     width: 50%;
     text-align: center;
   }
+}
+
+.participants-popover {
+  background: var(--mds-color-theme-background-solid-primary-normal, #FFFFFF) !important;
+  .participants-menu {
+    max-height: 12.5rem;
+    overflow-y: auto;
+  }
+
+  .participant-menu-item {
+    padding: 0.2rem;
+    font-size: 0.875rem;
+    cursor: pointer;
+    color: var(--mds-color-theme-text-primary-normal, #000000F2);
+  }
 }
\ No newline at end of file
diff --git a/packages/contact-center/cc-components/src/components/task/CallControlCAD/call-control-cad.tsx b/packages/contact-center/cc-components/src/components/task/CallControlCAD/call-control-cad.tsx
index 96b88e944..a9d427cde 100644
--- a/packages/contact-center/cc-components/src/components/task/CallControlCAD/call-control-cad.tsx
+++ b/packages/contact-center/cc-components/src/components/task/CallControlCAD/call-control-cad.tsx
@@ -1,11 +1,12 @@
 import React from 'react';
 import CallControlComponent from '../CallControl/call-control';
-import {Text} from '@momentum-ui/react-collaboration';
-import {Brandvisual, Icon, Tooltip} from '@momentum-design/components/dist/react';
+import {Text, PopoverNext} from '@momentum-ui/react-collaboration';
+import {Brandvisual, Icon, Tooltip, Button} from '@momentum-design/components/dist/react';
 import './call-control-cad.styles.scss';
 import TaskTimer from '../TaskTimer/index';
 import CallControlConsultComponent from '../CallControl/CallControlCustom/call-control-consult';
 import {MEDIA_CHANNEL as MediaChannelType, CallControlComponentProps} from '../task.types';
+
 import {getMediaTypeInfo} from '../../../utils';
 import {
   NO_CUSTOMER_NAME,
@@ -24,24 +25,22 @@ import {withMetrics} from '@webex/cc-ui-logging';
 const CallControlCADComponent: React.FC<CallControlComponentProps> = (props) => {
   const {
     currentTask,
-    isHeld,
     isRecording,
     holdTime,
-    consultAccepted,
-    consultInitiated,
     consultAgentName,
     consultStartTimeStamp,
     endConsultCall,
-    consultCompleted,
     consultTransfer,
+    consultConference,
+    switchToMainCall,
     callControlClassName,
     callControlConsultClassName,
     startTimestamp,
-    isEndConsultEnabled,
     controlVisibility,
     logger,
     isMuted,
     toggleMute,
+    conferenceParticipants,
   } = props;
 
   const formatTime = (time: number): string => {
@@ -164,26 +163,81 @@ const CallControlCADComponent: React.FC<CallControlComponentProps> = (props) =>
           <div className="customer-info">
             {renderCustomerName()}
             <div className="call-details">
-              <Text className="call-timer" type="body-secondary" tagName={'small'} data-testid="cc-cad:call-timer">
-                {currentMediaType.labelName} - <TaskTimer startTimeStamp={startTimestamp} />
-              </Text>
-              <div className="call-status">
-                {!controlVisibility.wrapup && isHeld && (
+              <div className="call-details-row">
+                <Text className="call-timer" type="body-secondary" tagName={'small'} data-testid="cc-cad:call-timer">
+                  {currentMediaType.labelName} - <TaskTimer startTimeStamp={startTimestamp} />
+                </Text>
+                {controlVisibility.isConferenceInProgress && !controlVisibility.wrapup.isVisible && (
                   <>
-                    <span className="dot">•</span>
-                    <div className="on-hold">
-                      <Icon name="call-hold-filled" size={1} className="call-hold-filled-icon" />
-                      <span className="on-hold-chip-text">
-                        {ON_HOLD} {formatTime(holdTime)}
-                      </span>
+                    <div className="vertical-divider"></div>
+                    <div className="participants-section">
+                      <div className="participants-indicator">
+                        <Text type="body-secondary" tagName={'small'} className="participants-count">
+                          +{Object.keys(conferenceParticipants).length || 1}
+                        </Text>
+                        <Icon name="participant-list-regular" size={0.875} className="participants-icon" />
+                      </div>
+                      <PopoverNext
+                        color="secondary"
+                        delay={[0, 0]}
+                        placement="bottom-start"
+                        showArrow
+                        trigger="click"
+                        variant="medium"
+                        interactive
+                        offsetDistance={2}
+                        className="participants-popover"
+                        triggerComponent={
+                          <Button
+                            id="participants-trigger"
+                            aria-label="Select Participant"
+                            data-testid="call-control:participants-trigger"
+                            className="participants-select-button"
+                            color="default"
+                            variant="tertiary"
+                          >
+                            <Icon name="arrow-down-bold" className="dropdown-arrow" />
+                          </Button>
+                        }
+                      >
+                        <div className="participants-menu">
+                          {conferenceParticipants?.map((participant) => (
+                            <div
+                              key={participant.id}
+                              className="participant-menu-item"
+                              role="menuitem"
+                              tabIndex={0}
+                              data-testid={`call-control:participant-${participant.name?.toLowerCase()}`}
+                            >
+                              {participant.name}
+                            </div>
+                          ))}
+                        </div>
+                      </PopoverNext>
                     </div>
                   </>
                 )}
               </div>
+              <div className="call-status">
+                {!controlVisibility.wrapup.isVisible &&
+                  controlVisibility.isHeld &&
+                  !controlVisibility.isConsultReceived &&
+                  !controlVisibility.consultCallHeld && (
+                    <>
+                      <span className="dot">•</span>
+                      <div className="on-hold">
+                        <Icon name="call-hold-filled" size={1} className="call-hold-filled-icon" />
+                        <span className="on-hold-chip-text">
+                          {ON_HOLD} {formatTime(holdTime)}
+                        </span>
+                      </div>
+                    </>
+                  )}
+              </div>
             </div>
           </div>
         </div>
-        {!controlVisibility.wrapup && controlVisibility.recordingIndicator && (
+        {!controlVisibility.wrapup.isVisible && controlVisibility.recordingIndicator.isVisible && (
           <div className="recording-indicator">
             <Icon name={isRecording ? 'record-active-badge-filled' : 'record-paused-badge-filled'} size={1.3} />
           </div>
@@ -213,20 +267,19 @@ const CallControlCADComponent: React.FC<CallControlComponentProps> = (props) =>
           </Text>
         </div>
       </div>
-      {(consultAccepted || consultInitiated) && !controlVisibility.wrapup && isTelephony && (
+      {controlVisibility.isConsultInitiatedOrAccepted && !controlVisibility.wrapup.isVisible && (
         <div className={`call-control-consult-container ${callControlConsultClassName || ''}`}>
           <CallControlConsultComponent
             agentName={consultAgentName}
             startTimeStamp={consultStartTimeStamp}
             endConsultCall={endConsultCall}
-            onTransfer={consultTransfer}
-            consultCompleted={consultCompleted}
-            isAgentBeingConsulted={!consultAccepted}
-            isEndConsultEnabled={isEndConsultEnabled}
+            consultTransfer={consultTransfer}
+            consultConference={consultConference}
+            switchToMainCall={switchToMainCall}
             logger={logger}
-            muteUnmute={controlVisibility.muteUnmute}
             isMuted={isMuted}
-            onToggleConsultMute={toggleMute}
+            controlVisibility={controlVisibility}
+            toggleConsultMute={toggleMute}
           />
         </div>
       )}
diff --git a/packages/contact-center/cc-components/src/components/task/TaskList/task-list.tsx b/packages/contact-center/cc-components/src/components/task/TaskList/task-list.tsx
index 76a3fae83..c0f2fa29d 100644
--- a/packages/contact-center/cc-components/src/components/task/TaskList/task-list.tsx
+++ b/packages/contact-center/cc-components/src/components/task/TaskList/task-list.tsx
@@ -12,7 +12,7 @@ import './styles.scss';
 import {withMetrics} from '@webex/cc-ui-logging';
 
 const TaskListComponent: React.FunctionComponent<TaskListComponentProps> = (props) => {
-  const {currentTask, taskList, acceptTask, declineTask, isBrowser, onTaskSelect, logger} = props;
+  const {currentTask, taskList, acceptTask, declineTask, isBrowser, onTaskSelect, logger, agentId} = props;
 
   // Early return for empty task list
   if (isTaskListEmpty(taskList)) {
@@ -25,7 +25,7 @@ const TaskListComponent: React.FunctionComponent<TaskListComponentProps> = (prop
     <ul className="task-list" data-testid="task-list">
       {tasks.map((task, index) => {
         // Extract all task data using the utility function
-        const taskData = extractTaskListItemData(task, isBrowser);
+        const taskData = extractTaskListItemData(task, isBrowser, agentId, logger);
 
         // Log task rendering
         logger.info('CC-Widgets: TaskList: rendering task list', {
@@ -45,7 +45,7 @@ const TaskListComponent: React.FunctionComponent<TaskListComponentProps> = (prop
             acceptTask={() => acceptTask(task)}
             declineTask={() => declineTask(task)}
             ronaTimeout={taskData.ronaTimeout}
-            onTaskSelect={createTaskSelectHandler(task, currentTask, onTaskSelect)}
+            onTaskSelect={createTaskSelectHandler(task, currentTask, onTaskSelect, agentId)}
             acceptText={taskData.acceptText}
             disableAccept={taskData.disableAccept}
             declineText={taskData.declineText}
diff --git a/packages/contact-center/cc-components/src/components/task/TaskList/task-list.utils.ts b/packages/contact-center/cc-components/src/components/task/TaskList/task-list.utils.ts
index d745b8b48..3668b3b09 100644
--- a/packages/contact-center/cc-components/src/components/task/TaskList/task-list.utils.ts
+++ b/packages/contact-center/cc-components/src/components/task/TaskList/task-list.utils.ts
@@ -1,5 +1,5 @@
 import {MEDIA_CHANNEL, TaskListItemData} from '../task.types';
-import {ITask} from '@webex/cc-store';
+import {ILogger, ITask} from '@webex/cc-store';
 import {isIncomingTask} from '@webex/cc-store';
 /**
  * Extracts and processes data from a task for rendering in the task list
@@ -7,7 +7,12 @@ import {isIncomingTask} from '@webex/cc-store';
  * @param isBrowser - Whether the device type is browser
  * @returns Processed task data with computed values
  */
-export const extractTaskListItemData = (task: ITask, isBrowser: boolean, logger?): TaskListItemData => {
+export const extractTaskListItemData = (
+  task: ITask,
+  isBrowser: boolean,
+  agentId: string,
+  logger?: ILogger
+): TaskListItemData => {
   try {
     // Extract basic data from task
     //@ts-expect-error  To be fixed in SDK - https://jira-eng-sjc12.cisco.com/jira/browse/CAI-6762
@@ -21,7 +26,7 @@ export const extractTaskListItemData = (task: ITask, isBrowser: boolean, logger?
 
     const taskState = task.data.interaction.state;
     const startTimeStamp = task.data.interaction.createdTimestamp;
-    const isTaskIncoming = isIncomingTask(task);
+    const isTaskIncoming = isIncomingTask(task, agentId);
     const mediaType = task.data.interaction.mediaType;
     const mediaChannel = task.data.interaction.mediaChannel;
 
@@ -193,12 +198,13 @@ export const createTaskSelectHandler = (
   task: ITask,
   currentTask: ITask | null,
   onTaskSelect: (task: ITask) => void,
+  agentId: string,
   logger?
 ) => {
   return () => {
     try {
       // Logging moved to helper.ts
-      const taskData = extractTaskListItemData(task, true, logger); // Use browser=true for selection logic
+      const taskData = extractTaskListItemData(task, true, agentId, logger); // Use browser=true for selection logic
 
       if (isTaskSelectable(task, currentTask, taskData, logger)) {
         onTaskSelect(task);
diff --git a/packages/contact-center/cc-components/src/components/task/task.types.ts b/packages/contact-center/cc-components/src/components/task/task.types.ts
index d18aa9ca7..e78530c82 100644
--- a/packages/contact-center/cc-components/src/components/task/task.types.ts
+++ b/packages/contact-center/cc-components/src/components/task/task.types.ts
@@ -9,6 +9,7 @@ import {
   AddressBookEntry,
   EntryPointRecord,
   FetchPaginatedList,
+  Participant,
 } from '@webex/cc-store';
 
 type Enum<T extends Record<string, unknown>> = T[keyof T];
@@ -118,6 +119,11 @@ export interface TaskProps {
    * The logger instance from SDK
    */
   logger: ILogger;
+
+  /**
+   * Agent ID of the logged-in user
+   */
+  agentId: string;
 }
 
 export type IncomingTaskComponentProps = Pick<TaskProps, 'isBrowser' | 'accept' | 'reject' | 'logger'> &
@@ -125,7 +131,7 @@ export type IncomingTaskComponentProps = Pick<TaskProps, 'isBrowser' | 'accept'
 
 export type TaskListComponentProps = Pick<
   TaskProps,
-  'isBrowser' | 'acceptTask' | 'declineTask' | 'onTaskSelect' | 'logger'
+  'isBrowser' | 'acceptTask' | 'declineTask' | 'onTaskSelect' | 'logger' | 'agentId'
 > &
   Partial<Pick<TaskProps, 'currentTask' | 'taskList'>>;
 
@@ -276,32 +282,41 @@ export interface ControlProps {
    * @param destinationType
    * @returns
    */
-  consultCall: (consultDestination: string, destinationType: DestinationType) => void;
+  consultCall: (
+    consultDestination: string,
+    destinationType: DestinationType,
+    allowParticipantsToInteract: boolean
+  ) => void;
 
   /**
-   * Function to end the consult call.
+   * Function to merge the consult call in a conference.
    */
-  endConsultCall: () => void;
+  consultConference: () => void;
 
   /**
-   * Function to transfer the consult call to a already established consult.
+   * Function to switch to conference call.
    */
-  consultTransfer: () => void;
+  switchToMainCall: () => void;
 
   /**
-   * Flag to determine if the consult call is connecting.
+   * Function to switch to consult call.
    */
-  consultInitiated: boolean;
+  switchToConsult: () => void;
 
   /**
-   * Flag to determine if the consult call is connecting.
+   * Function to exit Conference
+   */
+  exitConference: () => void;
+
+  /**
+   * Function to end the consult call.
    */
-  consultCompleted: boolean;
+  endConsultCall: () => void;
 
   /**
-   * Flag to determine if the consult call is accepted.
+   * Function to transfer the consult call to a already established consult.
    */
-  consultAccepted: boolean;
+  consultTransfer: () => void;
 
   /**
    * Timestamp when the consult call started.
@@ -314,17 +329,6 @@ export interface ControlProps {
    */
   callControlAudio: MediaStream | null;
 
-  /**
-   * ID of the consulting agent
-   */
-  consultAgentId: string;
-
-  /**
-   * Function to set the consulting agent ID
-   * @param agentId - The ID of the consulting agent.
-   */
-  setConsultAgentId: (agentId: string) => void;
-
   /**
    * Name of the consulting agent.
    */
@@ -381,6 +385,11 @@ export interface ControlProps {
    */
   allowConsultToQueue: boolean;
 
+  /**
+   * Flag to enable or disable multi-party conference feature
+   */
+  multiPartyConferenceEnabled: boolean;
+
   /**
    * Function to set the last target type
    */
@@ -391,20 +400,7 @@ export interface ControlProps {
    */
   setLastTargetType: (targetType: 'queue' | 'agent') => void;
 
-  controlVisibility: {
-    accept: boolean;
-    decline: boolean;
-    end: boolean;
-    muteUnmute: boolean;
-    holdResume: boolean;
-    consult: boolean;
-    transfer: boolean;
-    conference: boolean;
-    wrapup: boolean;
-    pauseResumeRecording: boolean;
-    endConsult: boolean;
-    recordingIndicator: boolean;
-  };
+  controlVisibility: ControlVisibility;
 
   secondsUntilAutoWrapup?: number;
 
@@ -413,6 +409,11 @@ export interface ControlProps {
    */
   cancelAutoWrapup: () => void;
 
+  /**
+   * List of participants in the conference excluding the agent themselves.
+   */
+  conferenceParticipants: Participant[];
+
   /** Fetch paginated address book entries for dial numbers */
   getAddressBookEntries?: FetchPaginatedList<AddressBookEntry>;
 
@@ -426,6 +427,11 @@ export interface ControlProps {
    * Options to configure consult/transfer popover behavior.
    */
   consultTransferOptions?: ConsultTransferOptions;
+
+  /**
+   * Agent ID of the logged-in user
+   */
+  agentId: string;
 }
 
 export type CallControlComponentProps = Pick<
@@ -438,32 +444,26 @@ export type CallControlComponentProps = Pick<
   | 'isMuted'
   | 'endCall'
   | 'wrapupCall'
-  | 'isHeld'
-  | 'setIsHeld'
   | 'isRecording'
   | 'setIsRecording'
   | 'buddyAgents'
   | 'loadBuddyAgents'
   | 'transferCall'
   | 'consultCall'
+  | 'consultConference'
+  | 'switchToMainCall'
+  | 'switchToConsult'
+  | 'exitConference'
   | 'endConsultCall'
-  | 'consultInitiated'
   | 'consultTransfer'
-  | 'consultCompleted'
-  | 'consultAccepted'
   | 'consultStartTimeStamp'
   | 'callControlAudio'
   | 'consultAgentName'
   | 'setConsultAgentName'
-  | 'consultAgentId'
-  | 'setConsultAgentId'
   | 'holdTime'
   | 'callControlClassName'
   | 'callControlConsultClassName'
   | 'startTimestamp'
-  | 'queues'
-  | 'loadQueues'
-  | 'isEndConsultEnabled'
   | 'allowConsultToQueue'
   | 'lastTargetType'
   | 'setLastTargetType'
@@ -471,6 +471,7 @@ export type CallControlComponentProps = Pick<
   | 'logger'
   | 'secondsUntilAutoWrapup'
   | 'cancelAutoWrapup'
+  | 'conferenceParticipants'
   | 'getAddressBookEntries'
   | 'getEntryPoints'
   | 'getQueuesFetcher'
@@ -553,13 +554,14 @@ export interface ConsultTransferPopoverComponentProps {
   getAddressBookEntries?: FetchPaginatedList<AddressBookEntry>;
   getEntryPoints?: FetchPaginatedList<EntryPointRecord>;
   getQueues?: FetchPaginatedList<ContactServiceQueue>;
-  onAgentSelect?: (agentId: string, agentName: string) => void;
-  onQueueSelect?: (queueId: string, queueName: string) => void;
-  onEntryPointSelect?: (entryPointId: string, entryPointName: string) => void;
-  onDialNumberSelect?: (dialNumber: string) => void;
+  onAgentSelect: (agentId: string, agentName: string, allowParticipantsToInteract: boolean) => void;
+  onQueueSelect: (queueId: string, queueName: string, allowParticipantsToInteract: boolean) => void;
+  onEntryPointSelect: (entryPointId: string, entryPointName: string, allowParticipantsToInteract: boolean) => void;
+  onDialNumberSelect: (dialNumber: string, allowParticipantsToInteract: boolean) => void;
   allowConsultToQueue: boolean;
   /** Options governing popover visibility/behavior */
   consultTransferOptions?: ConsultTransferOptions;
+  isConferenceInProgress?: boolean;
   logger: ILogger;
 }
 
@@ -569,21 +571,20 @@ export interface ConsultTransferPopoverComponentProps {
 export interface CallControlConsultComponentsProps {
   agentName: string;
   startTimeStamp: number;
-  onTransfer?: () => void;
-  endConsultCall?: () => void;
-  consultCompleted: boolean;
-  isAgentBeingConsulted: boolean;
-  isEndConsultEnabled: boolean;
+  consultTransfer: () => void;
+  endConsultCall: () => void;
+  consultConference: () => void;
+  switchToMainCall: () => void;
   logger: ILogger;
-  muteUnmute: boolean;
   isMuted: boolean;
-  onToggleConsultMute?: () => void;
+  controlVisibility: ControlVisibility;
+  toggleConsultMute: () => void;
 }
 
 /**
  * Type representing the possible menu types in call control.
  */
-export type CallControlMenuType = 'Consult' | 'Transfer';
+export type CallControlMenuType = 'Consult' | 'Transfer' | 'ExitConference';
 
 export const MEDIA_CHANNEL = {
   EMAIL: 'email',
@@ -624,19 +625,38 @@ export interface CallControlButton {
   dataTestId?: string;
 }
 
+export type Visibility = {
+  isVisible: boolean;
+  isEnabled: boolean;
+};
 export interface ControlVisibility {
-  accept: boolean;
-  decline: boolean;
-  end: boolean;
-  muteUnmute: boolean;
-  holdResume: boolean;
-  consult: boolean;
-  transfer: boolean;
-  conference: boolean;
-  wrapup: boolean;
-  pauseResumeRecording: boolean;
-  endConsult: boolean;
-  recordingIndicator: boolean;
+  accept: Visibility;
+  decline: Visibility;
+  end: Visibility;
+  muteUnmute: Visibility;
+  muteUnmuteConsult: Visibility;
+  holdResume: Visibility;
+  consult: Visibility;
+  transfer: Visibility;
+  conference: Visibility;
+  wrapup: Visibility;
+  pauseResumeRecording: Visibility;
+  endConsult: Visibility;
+  recordingIndicator: Visibility;
+  exitConference: Visibility;
+  mergeConference: Visibility;
+  consultTransfer: Visibility;
+  mergeConferenceConsult: Visibility;
+  consultTransferConsult: Visibility;
+  switchToMainCall: Visibility;
+  switchToConsult: Visibility;
+  isConferenceInProgress: boolean;
+  isConsultInitiated: boolean;
+  isConsultInitiatedAndAccepted: boolean;
+  isConsultReceived: boolean;
+  isConsultInitiatedOrAccepted: boolean;
+  isHeld: boolean;
+  consultCallHeld: boolean;
 }
 
 export interface MediaTypeInfo {
@@ -743,3 +763,16 @@ export interface ConsultTransferOptions {
   /** Show the Entry Point tab. Defaults to true. */
   showEntryPointTab?: boolean;
 }
+
+/**
+ * Interface for button configuration
+ */
+export interface ButtonConfig {
+  key: string;
+  icon: string;
+  onClick: () => void;
+  tooltip: string;
+  className: string;
+  disabled?: boolean;
+  isVisible: boolean;
+}
diff --git a/packages/contact-center/cc-components/tests/components/StationLogin/station-login.utils.tsx b/packages/contact-center/cc-components/tests/components/StationLogin/station-login.utils.tsx
index c61bd416a..e62261fbd 100644
--- a/packages/contact-center/cc-components/tests/components/StationLogin/station-login.utils.tsx
+++ b/packages/contact-center/cc-components/tests/components/StationLogin/station-login.utils.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import '@testing-library/jest-dom';
-import {DESKTOP, DIALNUMBER, EXTENSION, LoginOptions} from '@webex/cc-store';
+import {DESKTOP, DIAL_NUMBER, EXTENSION, LoginOptions} from '@webex/cc-store';
 import {
   handleModals,
   continueClicked,
@@ -176,14 +176,14 @@ describe('Station Login Utils', () => {
   });
 
   describe('updateDialNumberLabel', () => {
-    it('should update label and placeholder for DIALNUMBER option', () => {
+    it('should update label and placeholder for DIAL_NUMBER option', () => {
       const mockSetDialNumberLabel = jest.fn();
       const mockSetDialNumberPlaceholder = jest.fn();
 
-      updateDialNumberLabel(DIALNUMBER, mockSetDialNumberLabel, mockSetDialNumberPlaceholder, loggerMock);
+      updateDialNumberLabel(DIAL_NUMBER, mockSetDialNumberLabel, mockSetDialNumberPlaceholder, loggerMock);
 
-      expect(mockSetDialNumberLabel).toHaveBeenCalledWith(LoginOptions[DIALNUMBER]);
-      expect(mockSetDialNumberPlaceholder).toHaveBeenCalledWith(LoginOptions[DIALNUMBER]);
+      expect(mockSetDialNumberLabel).toHaveBeenCalledWith(LoginOptions[DIAL_NUMBER]);
+      expect(mockSetDialNumberPlaceholder).toHaveBeenCalledWith(LoginOptions[DIAL_NUMBER]);
     });
 
     it('should update label and placeholder for EXTENSION option', () => {
@@ -342,7 +342,7 @@ describe('Station Login Utils', () => {
     });
 
     it('should handle valid login option change', () => {
-      const event = {detail: {value: DIALNUMBER}};
+      const event = {detail: {value: DIAL_NUMBER}};
 
       handleLoginOptionChanged(
         event,
@@ -362,24 +362,27 @@ describe('Station Login Utils', () => {
         'team456'
       );
 
-      expect(loggerMock.info).toHaveBeenCalledWith(`CC-Widgets: StationLogin: login option changed to: ${DIALNUMBER}`, {
-        module: 'cc-components#station-login.tsx',
-        method: 'loginOptionChanged',
-      });
-      expect(mockSetters.setDeviceType).toHaveBeenCalledWith(DIALNUMBER);
-      expect(mockSetters.setSelectedDeviceType).toHaveBeenCalledWith(DIALNUMBER);
+      expect(loggerMock.info).toHaveBeenCalledWith(
+        `CC-Widgets: StationLogin: login option changed to: ${DIAL_NUMBER}`,
+        {
+          module: 'cc-components#station-login.tsx',
+          method: 'loginOptionChanged',
+        }
+      );
+      expect(mockSetters.setDeviceType).toHaveBeenCalledWith(DIAL_NUMBER);
+      expect(mockSetters.setSelectedDeviceType).toHaveBeenCalledWith(DIAL_NUMBER);
       expect(mockUpdateDialNumberLabel).toHaveBeenCalled();
       expect(mockSetters.setDialNumber).toHaveBeenCalledWith('');
       expect(mockSetters.setShowDNError).toHaveBeenCalledWith(false);
       expect(mockSetters.setCurrentLoginOptions).toHaveBeenCalledWith({
-        deviceType: DIALNUMBER,
+        deviceType: DIAL_NUMBER,
         dialNumber: '',
         teamId: 'team456',
       });
     });
 
     it('should handle valid login option change without selectedTeamId', () => {
-      const event = {detail: {value: DIALNUMBER}};
+      const event = {detail: {value: DIAL_NUMBER}};
 
       handleLoginOptionChanged(
         event,
@@ -399,17 +402,20 @@ describe('Station Login Utils', () => {
         null
       );
 
-      expect(loggerMock.info).toHaveBeenCalledWith(`CC-Widgets: StationLogin: login option changed to: ${DIALNUMBER}`, {
-        module: 'cc-components#station-login.tsx',
-        method: 'loginOptionChanged',
-      });
-      expect(mockSetters.setDeviceType).toHaveBeenCalledWith(DIALNUMBER);
-      expect(mockSetters.setSelectedDeviceType).toHaveBeenCalledWith(DIALNUMBER);
+      expect(loggerMock.info).toHaveBeenCalledWith(
+        `CC-Widgets: StationLogin: login option changed to: ${DIAL_NUMBER}`,
+        {
+          module: 'cc-components#station-login.tsx',
+          method: 'loginOptionChanged',
+        }
+      );
+      expect(mockSetters.setDeviceType).toHaveBeenCalledWith(DIAL_NUMBER);
+      expect(mockSetters.setSelectedDeviceType).toHaveBeenCalledWith(DIAL_NUMBER);
       expect(mockUpdateDialNumberLabel).toHaveBeenCalled();
       expect(mockSetters.setDialNumber).toHaveBeenCalledWith('');
       expect(mockSetters.setShowDNError).toHaveBeenCalledWith(false);
       expect(mockSetters.setCurrentLoginOptions).toHaveBeenCalledWith({
-        deviceType: DIALNUMBER,
+        deviceType: DIAL_NUMBER,
         dialNumber: '',
         teamId: '',
       });
@@ -530,7 +536,7 @@ describe('Station Login Utils', () => {
         mockSetters.setDNErrorText,
         dialNumberRegex,
         mockSetters.setCurrentLoginOptions,
-        DIALNUMBER,
+        DIAL_NUMBER,
         loggerMock
       );
 
@@ -565,7 +571,7 @@ describe('Station Login Utils', () => {
       expect(mockSetters.setShowDNError).toHaveBeenCalledWith(true);
     });
 
-    it('should validate dial number format for DIALNUMBER type', () => {
+    it('should validate dial number format for DIAL_NUMBER type', () => {
       const event = {target: {value: '911'}};
       const dialNumberRegex = null; // Use null to trigger default regex
 
@@ -577,7 +583,7 @@ describe('Station Login Utils', () => {
         mockSetters.setDNErrorText,
         dialNumberRegex,
         mockSetters.setCurrentLoginOptions,
-        DIALNUMBER,
+        DIAL_NUMBER,
         loggerMock
       );
 
diff --git a/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/__snapshots__/call-control-consult.snapshot.tsx.snap b/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/__snapshots__/call-control-consult.snapshot.tsx.snap
index 825d4a9c9..7de54104d 100644
--- a/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/__snapshots__/call-control-consult.snapshot.tsx.snap
+++ b/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/__snapshots__/call-control-consult.snapshot.tsx.snap
@@ -39,7 +39,7 @@ exports[`CallControlConsultComponent Snapshots Interactions should call mockEndC
     class="consult-buttons consult-buttons-container"
   >
     <button
-      aria-describedby="react-aria-:rr:"
+      aria-describedby="react-aria-:r1h:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -59,14 +59,41 @@ exports[`CallControlConsultComponent Snapshots Interactions should call mockEndC
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rr:"
+      id="react-aria-:r1h:"
     >
       <p>
         Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rs:"
+      aria-describedby="react-aria-:r1i:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="switchToMainCall-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-swap-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r1i:"
+    >
+      <p>
+        Switch to Call
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r1j:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -86,14 +113,41 @@ exports[`CallControlConsultComponent Snapshots Interactions should call mockEndC
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rs:"
+      id="react-aria-:r1j:"
     >
       <p>
-        Transfer Consult
+        Transfer
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rt:"
+      aria-describedby="react-aria-:r1k:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="conference-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-merge-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r1k:"
+    >
+      <p>
+        Merge
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r1l:"
       class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper md-focus-ring-wrapper children"
       data-color="primary"
       data-disabled="false"
@@ -113,7 +167,7 @@ exports[`CallControlConsultComponent Snapshots Interactions should call mockEndC
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rt:"
+      id="react-aria-:r1l:"
     >
       <p>
         End Consult
@@ -121,7 +175,7 @@ exports[`CallControlConsultComponent Snapshots Interactions should call mockEndC
     </div>
     <div
       data-tippy-root=""
-      id="tippy-30"
+      id="tippy-54"
       style="pointer-events: none; z-index: 9999; transition: none; position: absolute; left: 0px; top: 0px; margin: 0px;"
     />
   </div>
@@ -167,10 +221,10 @@ exports[`CallControlConsultComponent Snapshots Interactions should call mockOnTo
     class="consult-buttons consult-buttons-container"
   >
     <button
-      aria-describedby="react-aria-:rl:"
-      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper md-focus-ring-wrapper-disabled"
+      aria-describedby="react-aria-:r17:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper md-focus-ring-wrapper children"
       data-color="primary"
-      data-disabled="true"
+      data-disabled="false"
       data-ghost="false"
       data-inverted="false"
       data-multiple-children="false"
@@ -178,7 +232,6 @@ exports[`CallControlConsultComponent Snapshots Interactions should call mockOnTo
       data-shallow-disabled="false"
       data-size="40"
       data-testid="mute-consult-btn"
-      disabled=""
       type="button"
     >
       <mdc-icon
@@ -188,14 +241,41 @@ exports[`CallControlConsultComponent Snapshots Interactions should call mockOnTo
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rl:"
+      id="react-aria-:r17:"
     >
       <p>
         Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rm:"
+      aria-describedby="react-aria-:r18:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="switchToMainCall-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-swap-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r18:"
+    >
+      <p>
+        Switch to Call
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r19:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -215,14 +295,41 @@ exports[`CallControlConsultComponent Snapshots Interactions should call mockOnTo
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rm:"
+      id="react-aria-:r19:"
     >
       <p>
-        Transfer Consult
+        Transfer
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rn:"
+      aria-describedby="react-aria-:r1a:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="conference-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-merge-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r1a:"
+    >
+      <p>
+        Merge
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r1b:"
       class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -242,7 +349,7 @@ exports[`CallControlConsultComponent Snapshots Interactions should call mockOnTo
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rn:"
+      id="react-aria-:r1b:"
     >
       <p>
         End Consult
@@ -250,8 +357,8 @@ exports[`CallControlConsultComponent Snapshots Interactions should call mockOnTo
     </div>
     <div
       data-tippy-root=""
-      id="tippy-22"
-      style="pointer-events: none; z-index: 9999; transition: none; position: absolute; left: 0px; top: 0px; margin: 0px; transform: translate(0px, 0px);"
+      id="tippy-40"
+      style="pointer-events: none; z-index: 9999; transition: none; position: absolute; left: 0px; top: 0px; margin: 0px;"
     />
   </div>
 </div>
@@ -296,7 +403,7 @@ exports[`CallControlConsultComponent Snapshots Interactions should call mockOnTr
     class="consult-buttons consult-buttons-container"
   >
     <button
-      aria-describedby="react-aria-:ro:"
+      aria-describedby="react-aria-:r1c:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -316,14 +423,41 @@ exports[`CallControlConsultComponent Snapshots Interactions should call mockOnTr
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:ro:"
+      id="react-aria-:r1c:"
     >
       <p>
         Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rp:"
+      aria-describedby="react-aria-:r1d:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="switchToMainCall-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-swap-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r1d:"
+    >
+      <p>
+        Switch to Call
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r1e:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper md-focus-ring-wrapper children"
       data-color="primary"
       data-disabled="false"
@@ -343,14 +477,41 @@ exports[`CallControlConsultComponent Snapshots Interactions should call mockOnTr
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rp:"
+      id="react-aria-:r1e:"
     >
       <p>
-        Transfer Consult
+        Transfer
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rq:"
+      aria-describedby="react-aria-:r1f:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="conference-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-merge-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r1f:"
+    >
+      <p>
+        Merge
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r1g:"
       class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -370,7 +531,7 @@ exports[`CallControlConsultComponent Snapshots Interactions should call mockOnTr
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rq:"
+      id="react-aria-:r1g:"
     >
       <p>
         End Consult
@@ -378,7 +539,7 @@ exports[`CallControlConsultComponent Snapshots Interactions should call mockOnTr
     </div>
     <div
       data-tippy-root=""
-      id="tippy-26"
+      id="tippy-47"
       style="pointer-events: none; z-index: 9999; transition: none; position: absolute; left: 0px; top: 0px; margin: 0px;"
     />
   </div>
@@ -461,12 +622,12 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
       data-outline="false"
       data-shallow-disabled="false"
       data-size="40"
-      data-testid="transfer-consult-btn"
+      data-testid="switchToMainCall-consult-btn"
       type="button"
     >
       <mdc-icon
         class="call-control-button-icon"
-        name="next-bold"
+        name="call-swap-bold"
       />
     </button>
     <div
@@ -474,80 +635,11 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
       id="react-aria-:r1:"
     >
       <p>
-        Transfer Consult
+        Switch to Call
       </p>
     </div>
     <button
       aria-describedby="react-aria-:r2:"
-      class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
-      data-color="primary"
-      data-disabled="false"
-      data-ghost="false"
-      data-inverted="false"
-      data-multiple-children="false"
-      data-outline="false"
-      data-shallow-disabled="false"
-      data-size="40"
-      data-testid="cancel-consult-btn"
-      type="button"
-    >
-      <mdc-icon
-        class="call-control-consult-button-cancel-icon"
-        name="headset-muted-bold"
-      />
-    </button>
-    <div
-      class="md-tooltip-label"
-      id="react-aria-:r2:"
-    >
-      <p>
-        End Consult
-      </p>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements and visual states of CallControlConsult component should render when consultCompleted is false 1`] = `
-<div
-  class="call-control-consult"
->
-  <div
-    class="consult-header"
-  >
-    <mdc-avatar
-      class="task-avatar"
-      size="32"
-    />
-    <div>
-      <mdc-text
-        class="md-text-wrapper consult-agent-name"
-        tagname="p"
-        type="body-large-bold"
-      >
-        Alice
-      </mdc-text>
-      <mdc-text
-        class="md-text-wrapper consult-sub-text"
-        tagname="p"
-        type="body-midsize-regular"
-      >
-        Consult requested
-         • 
-        <time
-          class="task-text task-text--secondary"
-          datetime="00:00"
-        >
-          00:00
-        </time>
-      </mdc-text>
-    </div>
-  </div>
-  <div
-    class="consult-buttons consult-buttons-container"
-  >
-    <button
-      aria-describedby="react-aria-:rd:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -557,52 +649,51 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
       data-outline="false"
       data-shallow-disabled="false"
       data-size="40"
-      data-testid="mute-consult-btn"
+      data-testid="transfer-consult-btn"
       type="button"
     >
       <mdc-icon
         class="call-control-button-icon"
-        name="microphone-bold"
+        name="next-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rd:"
+      id="react-aria-:r2:"
     >
       <p>
-        Mute
+        Transfer
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:re:"
+      aria-describedby="react-aria-:r3:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
-      data-disabled="true"
+      data-disabled="false"
       data-ghost="false"
       data-inverted="false"
       data-multiple-children="false"
       data-outline="false"
       data-shallow-disabled="false"
       data-size="40"
-      data-testid="transfer-consult-btn"
-      disabled=""
+      data-testid="conference-consult-btn"
       type="button"
     >
       <mdc-icon
         class="call-control-button-icon"
-        name="next-bold"
+        name="call-merge-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:re:"
+      id="react-aria-:r3:"
     >
       <p>
-        Transfer Consult
+        Merge
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rf:"
+      aria-describedby="react-aria-:r4:"
       class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -622,7 +713,7 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rf:"
+      id="react-aria-:r4:"
     >
       <p>
         End Consult
@@ -632,7 +723,7 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
 </div>
 `;
 
-exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements and visual states of CallControlConsult component should render when isAgentBeingConsulted is false 1`] = `
+exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements and visual states of CallControlConsult component should render when end consult is disabled 1`] = `
 <div
   class="call-control-consult"
 >
@@ -671,7 +762,7 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
     class="consult-buttons consult-buttons-container"
   >
     <button
-      aria-describedby="react-aria-:rg:"
+      aria-describedby="react-aria-:r12:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -691,15 +782,15 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rg:"
+      id="react-aria-:r12:"
     >
       <p>
         Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rh:"
-      class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
+      aria-describedby="react-aria-:r13:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
       data-ghost="false"
@@ -708,17 +799,98 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
       data-outline="false"
       data-shallow-disabled="false"
       data-size="40"
-      data-testid="cancel-consult-btn"
+      data-testid="switchToMainCall-consult-btn"
       type="button"
     >
       <mdc-icon
-        class="call-control-consult-button-cancel-icon"
-        name="headset-muted-bold"
+        class="call-control-button-icon"
+        name="call-swap-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rh:"
+      id="react-aria-:r13:"
+    >
+      <p>
+        Switch to Call
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r14:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="transfer-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="next-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r14:"
+    >
+      <p>
+        Transfer
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r15:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="conference-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-merge-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r15:"
+    >
+      <p>
+        Merge
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r16:"
+      class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="cancel-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-consult-button-cancel-icon"
+        name="headset-muted-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r16:"
     >
       <p>
         End Consult
@@ -728,7 +900,7 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
 </div>
 `;
 
-exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements and visual states of CallControlConsult component should render when isEndConsultEnabled is false 1`] = `
+exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements and visual states of CallControlConsult component should render when transfer is disabled 1`] = `
 <div
   class="call-control-consult"
 >
@@ -767,7 +939,7 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
     class="consult-buttons consult-buttons-container"
   >
     <button
-      aria-describedby="react-aria-:ri:"
+      aria-describedby="react-aria-:rp:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -787,14 +959,41 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:ri:"
+      id="react-aria-:rp:"
     >
       <p>
         Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rj:"
+      aria-describedby="react-aria-:rq:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="switchToMainCall-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-swap-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rq:"
+    >
+      <p>
+        Switch to Call
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rr:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -814,14 +1013,41 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rj:"
+      id="react-aria-:rr:"
     >
       <p>
-        Transfer Consult
+        Transfer
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rk:"
+      aria-describedby="react-aria-:rs:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="conference-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-merge-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rs:"
+    >
+      <p>
+        Merge
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rt:"
       class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -841,7 +1067,7 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rk:"
+      id="react-aria-:rt:"
     >
       <p>
         End Consult
@@ -890,7 +1116,7 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
     class="consult-buttons consult-buttons-container"
   >
     <button
-      aria-describedby="react-aria-:ra:"
+      aria-describedby="react-aria-:rk:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -910,14 +1136,41 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:ra:"
+      id="react-aria-:rk:"
     >
       <p>
         Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rb:"
+      aria-describedby="react-aria-:rl:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="switchToMainCall-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-swap-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rl:"
+    >
+      <p>
+        Switch to Call
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rm:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -937,14 +1190,41 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rb:"
+      id="react-aria-:rm:"
     >
       <p>
-        Transfer Consult
+        Transfer
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rc:"
+      aria-describedby="react-aria-:rn:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="conference-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-merge-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rn:"
+    >
+      <p>
+        Merge
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:ro:"
       class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -964,7 +1244,7 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rc:"
+      id="react-aria-:ro:"
     >
       <p>
         End Consult
@@ -974,7 +1254,7 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
 </div>
 `;
 
-exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements and visual states of CallControlConsult component should render with muted state 1`] = `
+exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements and visual states of CallControlConsult component should render with end consult hidden 1`] = `
 <div
   class="call-control-consult"
 >
@@ -1013,8 +1293,8 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
     class="consult-buttons consult-buttons-container"
   >
     <button
-      aria-describedby="react-aria-:r3:"
-      class="md-button-circle-wrapper call-control-button-muted md-button-simple-wrapper"
+      aria-describedby="react-aria-:ru:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
       data-ghost="false"
@@ -1027,20 +1307,755 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
       type="button"
     >
       <mdc-icon
-        class="call-control-button-muted-icon"
-        name="microphone-muted-bold"
+        class="call-control-button-icon"
+        name="microphone-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:ru:"
+    >
+      <p>
+        Mute
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rv:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="switchToMainCall-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-swap-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rv:"
+    >
+      <p>
+        Switch to Call
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r10:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="transfer-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="next-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r10:"
+    >
+      <p>
+        Transfer
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r11:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="conference-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-merge-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r11:"
+    >
+      <p>
+        Merge
+      </p>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements and visual states of CallControlConsult component should render with muted state 1`] = `
+<div
+  class="call-control-consult"
+>
+  <div
+    class="consult-header"
+  >
+    <mdc-avatar
+      class="task-avatar"
+      size="32"
+    />
+    <div>
+      <mdc-text
+        class="md-text-wrapper consult-agent-name"
+        tagname="p"
+        type="body-large-bold"
+      >
+        Alice
+      </mdc-text>
+      <mdc-text
+        class="md-text-wrapper consult-sub-text"
+        tagname="p"
+        type="body-midsize-regular"
+      >
+        Consulting
+         • 
+        <time
+          class="task-text task-text--secondary"
+          datetime="00:00"
+        >
+          00:00
+        </time>
+      </mdc-text>
+    </div>
+  </div>
+  <div
+    class="consult-buttons consult-buttons-container"
+  >
+    <button
+      aria-describedby="react-aria-:r5:"
+      class="md-button-circle-wrapper call-control-button-muted md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="mute-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-muted-icon"
+        name="microphone-muted-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r5:"
+    >
+      <p>
+        Unmute
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r6:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="switchToMainCall-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-swap-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r6:"
+    >
+      <p>
+        Switch to Call
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r7:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="transfer-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="next-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r7:"
+    >
+      <p>
+        Transfer
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r8:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="conference-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-merge-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r8:"
+    >
+      <p>
+        Merge
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r9:"
+      class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="cancel-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-consult-button-cancel-icon"
+        name="headset-muted-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r9:"
+    >
+      <p>
+        End Consult
+      </p>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements and visual states of CallControlConsult component should render without mute button when muteUnmute is hidden 1`] = `
+<div
+  class="call-control-consult"
+>
+  <div
+    class="consult-header"
+  >
+    <mdc-avatar
+      class="task-avatar"
+      size="32"
+    />
+    <div>
+      <mdc-text
+        class="md-text-wrapper consult-agent-name"
+        tagname="p"
+        type="body-large-bold"
+      >
+        Alice
+      </mdc-text>
+      <mdc-text
+        class="md-text-wrapper consult-sub-text"
+        tagname="p"
+        type="body-midsize-regular"
+      >
+        Consulting
+         • 
+        <time
+          class="task-text task-text--secondary"
+          datetime="00:00"
+        >
+          00:00
+        </time>
+      </mdc-text>
+    </div>
+  </div>
+  <div
+    class="consult-buttons consult-buttons-container"
+  >
+    <button
+      aria-describedby="react-aria-:ra:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="mute-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="microphone-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:ra:"
+    >
+      <p>
+        Mute
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rb:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="switchToMainCall-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-swap-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rb:"
+    >
+      <p>
+        Switch to Call
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rc:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="transfer-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="next-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rc:"
+    >
+      <p>
+        Transfer
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rd:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="conference-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-merge-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rd:"
+    >
+      <p>
+        Merge
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:re:"
+      class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="cancel-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-consult-button-cancel-icon"
+        name="headset-muted-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:re:"
+    >
+      <p>
+        End Consult
+      </p>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements and visual states of CallControlConsult component should render without transfer button when onTransfer is undefined 1`] = `
+<div
+  class="call-control-consult"
+>
+  <div
+    class="consult-header"
+  >
+    <mdc-avatar
+      class="task-avatar"
+      size="32"
+    />
+    <div>
+      <mdc-text
+        class="md-text-wrapper consult-agent-name"
+        tagname="p"
+        type="body-large-bold"
+      >
+        Alice
+      </mdc-text>
+      <mdc-text
+        class="md-text-wrapper consult-sub-text"
+        tagname="p"
+        type="body-midsize-regular"
+      >
+        Consulting
+         • 
+        <time
+          class="task-text task-text--secondary"
+          datetime="00:00"
+        >
+          00:00
+        </time>
+      </mdc-text>
+    </div>
+  </div>
+  <div
+    class="consult-buttons consult-buttons-container"
+  >
+    <button
+      aria-describedby="react-aria-:rf:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="mute-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="microphone-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rf:"
+    >
+      <p>
+        Mute
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rg:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="switchToMainCall-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-swap-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rg:"
+    >
+      <p>
+        Switch to Call
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rh:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="transfer-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="next-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rh:"
+    >
+      <p>
+        Transfer
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:ri:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="conference-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-merge-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:ri:"
+    >
+      <p>
+        Merge
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rj:"
+      class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="cancel-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-consult-button-cancel-icon"
+        name="headset-muted-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rj:"
+    >
+      <p>
+        End Consult
+      </p>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`CallControlConsultComponent Snapshots State Management should handle combination of props: no mute, no transfer, disabled end consult 1`] = `
+<div
+  class="call-control-consult"
+>
+  <div
+    class="consult-header"
+  >
+    <mdc-avatar
+      class="task-avatar"
+      size="32"
+    />
+    <div>
+      <mdc-text
+        class="md-text-wrapper consult-agent-name"
+        tagname="p"
+        type="body-large-bold"
+      >
+        Alice
+      </mdc-text>
+      <mdc-text
+        class="md-text-wrapper consult-sub-text"
+        tagname="p"
+        type="body-midsize-regular"
+      >
+        Consulting
+         • 
+        <time
+          class="task-text task-text--secondary"
+          datetime="00:00"
+        >
+          00:00
+        </time>
+      </mdc-text>
+    </div>
+  </div>
+  <div
+    class="consult-buttons consult-buttons-container"
+  >
+    <button
+      aria-describedby="react-aria-:r20:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="mute-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="microphone-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r20:"
+    >
+      <p>
+        Mute
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r21:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="switchToMainCall-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-swap-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r21:"
+    >
+      <p>
+        Switch to Call
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r22:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="transfer-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="next-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r3:"
+      id="react-aria-:r22:"
     >
       <p>
-        Unmute
+        Transfer
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r4:"
+      aria-describedby="react-aria-:r23:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -1050,24 +2065,24 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
       data-outline="false"
       data-shallow-disabled="false"
       data-size="40"
-      data-testid="transfer-consult-btn"
+      data-testid="conference-consult-btn"
       type="button"
     >
       <mdc-icon
         class="call-control-button-icon"
-        name="next-bold"
+        name="call-merge-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r4:"
+      id="react-aria-:r23:"
     >
       <p>
-        Transfer Consult
+        Merge
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r5:"
+      aria-describedby="react-aria-:r24:"
       class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -1087,7 +2102,7 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r5:"
+      id="react-aria-:r24:"
     >
       <p>
         End Consult
@@ -1097,7 +2112,7 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
 </div>
 `;
 
-exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements and visual states of CallControlConsult component should render without mute button when muteUnmute is false 1`] = `
+exports[`CallControlConsultComponent Snapshots State Management should handle edge case with empty agent name 1`] = `
 <div
   class="call-control-consult"
 >
@@ -1113,9 +2128,7 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
         class="md-text-wrapper consult-agent-name"
         tagname="p"
         type="body-large-bold"
-      >
-        Alice
-      </mdc-text>
+      />
       <mdc-text
         class="md-text-wrapper consult-sub-text"
         tagname="p"
@@ -1136,7 +2149,7 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
     class="consult-buttons consult-buttons-container"
   >
     <button
-      aria-describedby="react-aria-:r6:"
+      aria-describedby="react-aria-:r25:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -1146,25 +2159,25 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
       data-outline="false"
       data-shallow-disabled="false"
       data-size="40"
-      data-testid="transfer-consult-btn"
+      data-testid="mute-consult-btn"
       type="button"
     >
       <mdc-icon
         class="call-control-button-icon"
-        name="next-bold"
+        name="microphone-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r6:"
+      id="react-aria-:r25:"
     >
       <p>
-        Transfer Consult
+        Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r7:"
-      class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
+      aria-describedby="react-aria-:r26:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
       data-ghost="false"
@@ -1173,66 +2186,51 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
       data-outline="false"
       data-shallow-disabled="false"
       data-size="40"
-      data-testid="cancel-consult-btn"
+      data-testid="switchToMainCall-consult-btn"
       type="button"
     >
       <mdc-icon
-        class="call-control-consult-button-cancel-icon"
-        name="headset-muted-bold"
+        class="call-control-button-icon"
+        name="call-swap-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r7:"
+      id="react-aria-:r26:"
     >
       <p>
-        End Consult
+        Switch to Call
       </p>
     </div>
-  </div>
-</div>
-`;
-
-exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements and visual states of CallControlConsult component should render without transfer button when onTransfer is undefined 1`] = `
-<div
-  class="call-control-consult"
->
-  <div
-    class="consult-header"
-  >
-    <mdc-avatar
-      class="task-avatar"
-      size="32"
-    />
-    <div>
-      <mdc-text
-        class="md-text-wrapper consult-agent-name"
-        tagname="p"
-        type="body-large-bold"
-      >
-        Alice
-      </mdc-text>
-      <mdc-text
-        class="md-text-wrapper consult-sub-text"
-        tagname="p"
-        type="body-midsize-regular"
-      >
-        Consulting
-         • 
-        <time
-          class="task-text task-text--secondary"
-          datetime="00:00"
-        >
-          00:00
-        </time>
-      </mdc-text>
+    <button
+      aria-describedby="react-aria-:r27:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="transfer-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="next-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r27:"
+    >
+      <p>
+        Transfer
+      </p>
     </div>
-  </div>
-  <div
-    class="consult-buttons consult-buttons-container"
-  >
     <button
-      aria-describedby="react-aria-:r8:"
+      aria-describedby="react-aria-:r28:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -1242,24 +2240,24 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
       data-outline="false"
       data-shallow-disabled="false"
       data-size="40"
-      data-testid="mute-consult-btn"
+      data-testid="conference-consult-btn"
       type="button"
     >
       <mdc-icon
         class="call-control-button-icon"
-        name="microphone-bold"
+        name="call-merge-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r8:"
+      id="react-aria-:r28:"
     >
       <p>
-        Mute
+        Merge
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r9:"
+      aria-describedby="react-aria-:r29:"
       class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -1279,7 +2277,7 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r9:"
+      id="react-aria-:r29:"
     >
       <p>
         End Consult
@@ -1289,7 +2287,7 @@ exports[`CallControlConsultComponent Snapshots Rendering - Tests for UI elements
 </div>
 `;
 
-exports[`CallControlConsultComponent Snapshots State Management should handle combination of props: no mute, no transfer, disabled end consult 1`] = `
+exports[`CallControlConsultComponent Snapshots State Management should update when isMuted prop changes 1`] = `
 <div
   class="call-control-consult"
 >
@@ -1328,8 +2326,8 @@ exports[`CallControlConsultComponent Snapshots State Management should handle co
     class="consult-buttons consult-buttons-container"
   >
     <button
-      aria-describedby="react-aria-:r14:"
-      class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
+      aria-describedby="react-aria-:r1r:"
+      class="md-button-circle-wrapper call-control-button-muted md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
       data-ghost="false"
@@ -1338,64 +2336,24 @@ exports[`CallControlConsultComponent Snapshots State Management should handle co
       data-outline="false"
       data-shallow-disabled="false"
       data-size="40"
-      data-testid="cancel-consult-btn"
+      data-testid="mute-consult-btn"
       type="button"
     >
       <mdc-icon
-        class="call-control-consult-button-cancel-icon"
-        name="headset-muted-bold"
+        class="call-control-button-muted-icon"
+        name="microphone-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r14:"
+      id="react-aria-:r1r:"
     >
       <p>
-        End Consult
+        Unmute
       </p>
     </div>
-  </div>
-</div>
-`;
-
-exports[`CallControlConsultComponent Snapshots State Management should handle edge case with empty agent name 1`] = `
-<div
-  class="call-control-consult"
->
-  <div
-    class="consult-header"
-  >
-    <mdc-avatar
-      class="task-avatar"
-      size="32"
-    />
-    <div>
-      <mdc-text
-        class="md-text-wrapper consult-agent-name"
-        tagname="p"
-        type="body-large-bold"
-      />
-      <mdc-text
-        class="md-text-wrapper consult-sub-text"
-        tagname="p"
-        type="body-midsize-regular"
-      >
-        Consulting
-         • 
-        <time
-          class="task-text task-text--secondary"
-          datetime="00:00"
-        >
-          00:00
-        </time>
-      </mdc-text>
-    </div>
-  </div>
-  <div
-    class="consult-buttons consult-buttons-container"
-  >
     <button
-      aria-describedby="react-aria-:r15:"
+      aria-describedby="react-aria-:r1s:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -1405,24 +2363,24 @@ exports[`CallControlConsultComponent Snapshots State Management should handle ed
       data-outline="false"
       data-shallow-disabled="false"
       data-size="40"
-      data-testid="mute-consult-btn"
+      data-testid="switchToMainCall-consult-btn"
       type="button"
     >
       <mdc-icon
         class="call-control-button-icon"
-        name="microphone-bold"
+        name="call-swap-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r15:"
+      id="react-aria-:r1s:"
     >
       <p>
-        Mute
+        Switch to Call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r16:"
+      aria-describedby="react-aria-:r1t:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -1442,14 +2400,41 @@ exports[`CallControlConsultComponent Snapshots State Management should handle ed
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r16:"
+      id="react-aria-:r1t:"
     >
       <p>
-        Transfer Consult
+        Transfer
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r17:"
+      aria-describedby="react-aria-:r1u:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="conference-consult-btn"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="call-merge-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r1u:"
+    >
+      <p>
+        Merge
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r1v:"
       class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -1469,7 +2454,7 @@ exports[`CallControlConsultComponent Snapshots State Management should handle ed
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r17:"
+      id="react-aria-:r1v:"
     >
       <p>
         End Consult
@@ -1479,7 +2464,7 @@ exports[`CallControlConsultComponent Snapshots State Management should handle ed
 </div>
 `;
 
-exports[`CallControlConsultComponent Snapshots State Management should update when isMuted prop changes 1`] = `
+exports[`CallControlConsultComponent Snapshots State Management should update when muteUnmute visibility changes 1`] = `
 <div
   class="call-control-consult"
 >
@@ -1518,8 +2503,8 @@ exports[`CallControlConsultComponent Snapshots State Management should update wh
     class="consult-buttons consult-buttons-container"
   >
     <button
-      aria-describedby="react-aria-:r11:"
-      class="md-button-circle-wrapper call-control-button-muted md-button-simple-wrapper"
+      aria-describedby="react-aria-:r1m:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
       data-ghost="false"
@@ -1532,20 +2517,20 @@ exports[`CallControlConsultComponent Snapshots State Management should update wh
       type="button"
     >
       <mdc-icon
-        class="call-control-button-muted-icon"
+        class="call-control-button-icon"
         name="microphone-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r11:"
+      id="react-aria-:r1m:"
     >
       <p>
-        Unmute
+        Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r12:"
+      aria-describedby="react-aria-:r1n:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -1555,25 +2540,25 @@ exports[`CallControlConsultComponent Snapshots State Management should update wh
       data-outline="false"
       data-shallow-disabled="false"
       data-size="40"
-      data-testid="transfer-consult-btn"
+      data-testid="switchToMainCall-consult-btn"
       type="button"
     >
       <mdc-icon
         class="call-control-button-icon"
-        name="next-bold"
+        name="call-swap-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r12:"
+      id="react-aria-:r1n:"
     >
       <p>
-        Transfer Consult
+        Switch to Call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r13:"
-      class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
+      aria-describedby="react-aria-:r1o:"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
       data-ghost="false"
@@ -1582,66 +2567,24 @@ exports[`CallControlConsultComponent Snapshots State Management should update wh
       data-outline="false"
       data-shallow-disabled="false"
       data-size="40"
-      data-testid="cancel-consult-btn"
+      data-testid="transfer-consult-btn"
       type="button"
     >
       <mdc-icon
-        class="call-control-consult-button-cancel-icon"
-        name="headset-muted-bold"
+        class="call-control-button-icon"
+        name="next-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r13:"
+      id="react-aria-:r1o:"
     >
       <p>
-        End Consult
+        Transfer
       </p>
     </div>
-  </div>
-</div>
-`;
-
-exports[`CallControlConsultComponent Snapshots State Management should update when muteUnmute prop changes 1`] = `
-<div
-  class="call-control-consult"
->
-  <div
-    class="consult-header"
-  >
-    <mdc-avatar
-      class="task-avatar"
-      size="32"
-    />
-    <div>
-      <mdc-text
-        class="md-text-wrapper consult-agent-name"
-        tagname="p"
-        type="body-large-bold"
-      >
-        Alice
-      </mdc-text>
-      <mdc-text
-        class="md-text-wrapper consult-sub-text"
-        tagname="p"
-        type="body-midsize-regular"
-      >
-        Consulting
-         • 
-        <time
-          class="task-text task-text--secondary"
-          datetime="00:00"
-        >
-          00:00
-        </time>
-      </mdc-text>
-    </div>
-  </div>
-  <div
-    class="consult-buttons consult-buttons-container"
-  >
     <button
-      aria-describedby="react-aria-:rv:"
+      aria-describedby="react-aria-:r1p:"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -1651,24 +2594,24 @@ exports[`CallControlConsultComponent Snapshots State Management should update wh
       data-outline="false"
       data-shallow-disabled="false"
       data-size="40"
-      data-testid="transfer-consult-btn"
+      data-testid="conference-consult-btn"
       type="button"
     >
       <mdc-icon
         class="call-control-button-icon"
-        name="next-bold"
+        name="call-merge-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rv:"
+      id="react-aria-:r1p:"
     >
       <p>
-        Transfer Consult
+        Merge
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r10:"
+      aria-describedby="react-aria-:r1q:"
       class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -1688,7 +2631,7 @@ exports[`CallControlConsultComponent Snapshots State Management should update wh
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r10:"
+      id="react-aria-:r1q:"
     >
       <p>
         End Consult
diff --git a/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/__snapshots__/consult-transfer-popover.snapshot.tsx.snap b/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/__snapshots__/consult-transfer-popover.snapshot.tsx.snap
index bbcdb219c..f661e7b40 100644
--- a/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/__snapshots__/consult-transfer-popover.snapshot.tsx.snap
+++ b/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/__snapshots__/consult-transfer-popover.snapshot.tsx.snap
@@ -95,160 +95,164 @@ exports[`ConsultTransferPopoverComponent Snapshots Interactions should render co
       </span>
     </button>
   </div>
-  <ul
-    class="agent-list md-list-wrapper"
+  <div
+    class="consult-list-container"
   >
-    <div
-      class="consult-list-item-wrapper"
-    >
-      <li
-        aria-label="Agent One"
-        class="call-control-list-item md-list-item-base-wrapper"
-        data-allow-text-select="false"
-        data-disabled="false"
-        data-interactive="true"
-        data-padded="true"
-        data-shape="rectangle"
-        data-size="50"
-        role="listitem"
-        tabindex="-1"
+    <ul
+      class="agent-list md-list-wrapper"
+    >
+      <div
+        class="consult-list-item-wrapper"
       >
-        <div
-          class="call-control-list-item-start"
-          data-position="start"
+        <li
+          aria-label="Agent One"
+          class="call-control-list-item md-list-item-base-wrapper"
+          data-allow-text-select="false"
+          data-disabled="false"
+          data-interactive="true"
+          data-padded="true"
+          data-shape="rectangle"
+          data-size="50"
+          role="listitem"
+          tabindex="-1"
         >
           <div
-            aria-hidden="false"
-            aria-label=""
-            class="md-avatar-wrapper"
-            data-color="default"
-            data-size="32"
-            role="img"
+            class="call-control-list-item-start"
+            data-position="start"
           >
-            <span
-              aria-hidden="true"
-              class="md-avatar-wrapper-children"
+            <div
+              aria-hidden="false"
+              aria-label=""
+              class="md-avatar-wrapper"
+              data-color="default"
+              data-size="32"
+              role="img"
             >
-              AO
-            </span>
+              <span
+                aria-hidden="true"
+                class="md-avatar-wrapper-children"
+              >
+                AO
+              </span>
+            </div>
           </div>
-        </div>
-        <div
-          class="call-control-list-item-middle"
-          data-position="middle"
-        >
-          <mdc-text
-            class="md-text-wrapper call-control-list-item-title"
-            tagname="div"
-            type="body-large-regular"
+          <div
+            class="call-control-list-item-middle"
+            data-position="middle"
           >
-            Agent One
-          </mdc-text>
-        </div>
-        <div
-          class="call-control-list-item-end"
-          data-position="end"
-        >
+            <mdc-text
+              class="md-text-wrapper call-control-list-item-title"
+              tagname="div"
+              type="body-large-regular"
+            >
+              Agent One
+            </mdc-text>
+          </div>
           <div
-            class="hover-button"
+            class="call-control-list-item-end"
+            data-position="end"
           >
-            <button
-              class="md-button-circle-wrapper md-button-simple-wrapper md-focus-ring-wrapper children"
-              data-color="join"
-              data-disabled="false"
-              data-ghost="false"
-              data-inverted="false"
-              data-multiple-children="false"
-              data-outline="false"
-              data-shallow-disabled="false"
-              data-size="32"
-              tabindex="-1"
-              type="button"
+            <div
+              class="hover-button"
             >
-              <mdc-icon
-                name="agent-icon"
-              />
-            </button>
+              <button
+                class="md-button-circle-wrapper md-button-simple-wrapper md-focus-ring-wrapper children"
+                data-color="join"
+                data-disabled="false"
+                data-ghost="false"
+                data-inverted="false"
+                data-multiple-children="false"
+                data-outline="false"
+                data-shallow-disabled="false"
+                data-size="32"
+                tabindex="-1"
+                type="button"
+              >
+                <mdc-icon
+                  name="agent-icon"
+                />
+              </button>
+            </div>
           </div>
-        </div>
-      </li>
-    </div>
-    <div
-      class="consult-list-item-wrapper"
-    >
-      <li
-        aria-label="Agent Two"
-        class="call-control-list-item md-list-item-base-wrapper"
-        data-allow-text-select="false"
-        data-disabled="false"
-        data-interactive="true"
-        data-padded="true"
-        data-shape="rectangle"
-        data-size="50"
-        role="listitem"
-        tabindex="-1"
+        </li>
+      </div>
+      <div
+        class="consult-list-item-wrapper"
       >
-        <div
-          class="call-control-list-item-start"
-          data-position="start"
+        <li
+          aria-label="Agent Two"
+          class="call-control-list-item md-list-item-base-wrapper"
+          data-allow-text-select="false"
+          data-disabled="false"
+          data-interactive="true"
+          data-padded="true"
+          data-shape="rectangle"
+          data-size="50"
+          role="listitem"
+          tabindex="-1"
         >
           <div
-            aria-hidden="false"
-            aria-label=""
-            class="md-avatar-wrapper"
-            data-color="default"
-            data-size="32"
-            role="img"
+            class="call-control-list-item-start"
+            data-position="start"
           >
-            <span
-              aria-hidden="true"
-              class="md-avatar-wrapper-children"
+            <div
+              aria-hidden="false"
+              aria-label=""
+              class="md-avatar-wrapper"
+              data-color="default"
+              data-size="32"
+              role="img"
             >
-              AT
-            </span>
+              <span
+                aria-hidden="true"
+                class="md-avatar-wrapper-children"
+              >
+                AT
+              </span>
+            </div>
           </div>
-        </div>
-        <div
-          class="call-control-list-item-middle"
-          data-position="middle"
-        >
-          <mdc-text
-            class="md-text-wrapper call-control-list-item-title"
-            tagname="div"
-            type="body-large-regular"
+          <div
+            class="call-control-list-item-middle"
+            data-position="middle"
           >
-            Agent Two
-          </mdc-text>
-        </div>
-        <div
-          class="call-control-list-item-end"
-          data-position="end"
-        >
+            <mdc-text
+              class="md-text-wrapper call-control-list-item-title"
+              tagname="div"
+              type="body-large-regular"
+            >
+              Agent Two
+            </mdc-text>
+          </div>
           <div
-            class="hover-button"
+            class="call-control-list-item-end"
+            data-position="end"
           >
-            <button
-              class="md-button-circle-wrapper md-button-simple-wrapper"
-              data-color="join"
-              data-disabled="false"
-              data-ghost="false"
-              data-inverted="false"
-              data-multiple-children="false"
-              data-outline="false"
-              data-shallow-disabled="false"
-              data-size="32"
-              tabindex="-1"
-              type="button"
+            <div
+              class="hover-button"
             >
-              <mdc-icon
-                name="agent-icon"
-              />
-            </button>
+              <button
+                class="md-button-circle-wrapper md-button-simple-wrapper"
+                data-color="join"
+                data-disabled="false"
+                data-ghost="false"
+                data-inverted="false"
+                data-multiple-children="false"
+                data-outline="false"
+                data-shallow-disabled="false"
+                data-size="32"
+                tabindex="-1"
+                type="button"
+              >
+                <mdc-icon
+                  name="agent-icon"
+                />
+              </button>
+            </div>
           </div>
-        </div>
-      </li>
-    </div>
-  </ul>
+        </li>
+      </div>
+    </ul>
+  </div>
 </div>
 `;
 
@@ -347,86 +351,90 @@ exports[`ConsultTransferPopoverComponent Snapshots Interactions should render co
       </span>
     </button>
   </div>
-  <div>
-    <ul
-      class="agent-list md-list-wrapper"
-    >
-      <div
-        class="consult-list-item-wrapper"
+  <div
+    class="consult-list-container"
+  >
+    <div>
+      <ul
+        class="agent-list md-list-wrapper"
       >
-        <li
-          aria-label="Queue One"
-          class="call-control-list-item md-list-item-base-wrapper"
-          data-allow-text-select="false"
-          data-disabled="false"
-          data-interactive="true"
-          data-padded="true"
-          data-shape="rectangle"
-          data-size="50"
-          role="listitem"
-          tabindex="-1"
+        <div
+          class="consult-list-item-wrapper"
         >
-          <div
-            class="call-control-list-item-start"
-            data-position="start"
+          <li
+            aria-label="Queue One"
+            class="call-control-list-item md-list-item-base-wrapper"
+            data-allow-text-select="false"
+            data-disabled="false"
+            data-interactive="true"
+            data-padded="true"
+            data-shape="rectangle"
+            data-size="50"
+            role="listitem"
+            tabindex="-1"
           >
             <div
-              aria-hidden="false"
-              aria-label=""
-              class="md-avatar-wrapper"
-              data-color="default"
-              data-size="32"
-              role="img"
+              class="call-control-list-item-start"
+              data-position="start"
             >
-              <span
-                aria-hidden="true"
-                class="md-avatar-wrapper-children"
+              <div
+                aria-hidden="false"
+                aria-label=""
+                class="md-avatar-wrapper"
+                data-color="default"
+                data-size="32"
+                role="img"
               >
-                QO
-              </span>
+                <span
+                  aria-hidden="true"
+                  class="md-avatar-wrapper-children"
+                >
+                  QO
+                </span>
+              </div>
             </div>
-          </div>
-          <div
-            class="call-control-list-item-middle"
-            data-position="middle"
-          >
-            <mdc-text
-              class="md-text-wrapper call-control-list-item-title"
-              tagname="div"
-              type="body-large-regular"
+            <div
+              class="call-control-list-item-middle"
+              data-position="middle"
             >
-              Queue One
-            </mdc-text>
-          </div>
-          <div
-            class="call-control-list-item-end"
-            data-position="end"
-          >
+              <mdc-text
+                class="md-text-wrapper call-control-list-item-title"
+                tagname="div"
+                type="body-large-regular"
+              >
+                Queue One
+              </mdc-text>
+            </div>
             <div
-              class="hover-button"
+              class="call-control-list-item-end"
+              data-position="end"
             >
-              <button
-                class="md-button-circle-wrapper md-button-simple-wrapper md-focus-ring-wrapper children"
-                data-color="join"
-                data-disabled="false"
-                data-ghost="false"
-                data-inverted="false"
-                data-multiple-children="false"
-                data-outline="false"
-                data-shallow-disabled="false"
-                data-size="32"
-                tabindex="-1"
-                type="button"
+              <div
+                class="hover-button"
               >
-                <mdc-icon
-                  name="agent-icon"
-                />
-              </button>
+                <button
+                  class="md-button-circle-wrapper md-button-simple-wrapper md-focus-ring-wrapper children"
+                  data-color="join"
+                  data-disabled="false"
+                  data-ghost="false"
+                  data-inverted="false"
+                  data-multiple-children="false"
+                  data-outline="false"
+                  data-shallow-disabled="false"
+                  data-size="32"
+                  tabindex="-1"
+                  type="button"
+                >
+                  <mdc-icon
+                    name="agent-icon"
+                  />
+                </button>
+              </div>
             </div>
-          </div>
-        </li>
-      </div>
-    </ul>
+          </li>
+        </div>
+      </ul>
+    </div>
   </div>
 </div>
 `;
@@ -526,86 +534,90 @@ exports[`ConsultTransferPopoverComponent Snapshots Interactions should render co
       </span>
     </button>
   </div>
-  <div>
-    <ul
-      class="agent-list md-list-wrapper"
-    >
-      <div
-        class="consult-list-item-wrapper"
+  <div
+    class="consult-list-container"
+  >
+    <div>
+      <ul
+        class="agent-list md-list-wrapper"
       >
-        <li
-          aria-label="Queue One"
-          class="call-control-list-item md-list-item-base-wrapper"
-          data-allow-text-select="false"
-          data-disabled="false"
-          data-interactive="true"
-          data-padded="true"
-          data-shape="rectangle"
-          data-size="50"
-          role="listitem"
-          tabindex="-1"
+        <div
+          class="consult-list-item-wrapper"
         >
-          <div
-            class="call-control-list-item-start"
-            data-position="start"
+          <li
+            aria-label="Queue One"
+            class="call-control-list-item md-list-item-base-wrapper"
+            data-allow-text-select="false"
+            data-disabled="false"
+            data-interactive="true"
+            data-padded="true"
+            data-shape="rectangle"
+            data-size="50"
+            role="listitem"
+            tabindex="-1"
           >
             <div
-              aria-hidden="false"
-              aria-label=""
-              class="md-avatar-wrapper"
-              data-color="default"
-              data-size="32"
-              role="img"
+              class="call-control-list-item-start"
+              data-position="start"
             >
-              <span
-                aria-hidden="true"
-                class="md-avatar-wrapper-children"
+              <div
+                aria-hidden="false"
+                aria-label=""
+                class="md-avatar-wrapper"
+                data-color="default"
+                data-size="32"
+                role="img"
               >
-                QO
-              </span>
+                <span
+                  aria-hidden="true"
+                  class="md-avatar-wrapper-children"
+                >
+                  QO
+                </span>
+              </div>
             </div>
-          </div>
-          <div
-            class="call-control-list-item-middle"
-            data-position="middle"
-          >
-            <mdc-text
-              class="md-text-wrapper call-control-list-item-title"
-              tagname="div"
-              type="body-large-regular"
+            <div
+              class="call-control-list-item-middle"
+              data-position="middle"
             >
-              Queue One
-            </mdc-text>
-          </div>
-          <div
-            class="call-control-list-item-end"
-            data-position="end"
-          >
+              <mdc-text
+                class="md-text-wrapper call-control-list-item-title"
+                tagname="div"
+                type="body-large-regular"
+              >
+                Queue One
+              </mdc-text>
+            </div>
             <div
-              class="hover-button"
+              class="call-control-list-item-end"
+              data-position="end"
             >
-              <button
-                class="md-button-circle-wrapper md-button-simple-wrapper"
-                data-color="join"
-                data-disabled="false"
-                data-ghost="false"
-                data-inverted="false"
-                data-multiple-children="false"
-                data-outline="false"
-                data-shallow-disabled="false"
-                data-size="32"
-                tabindex="-1"
-                type="button"
+              <div
+                class="hover-button"
               >
-                <mdc-icon
-                  name="agent-icon"
-                />
-              </button>
+                <button
+                  class="md-button-circle-wrapper md-button-simple-wrapper"
+                  data-color="join"
+                  data-disabled="false"
+                  data-ghost="false"
+                  data-inverted="false"
+                  data-multiple-children="false"
+                  data-outline="false"
+                  data-shallow-disabled="false"
+                  data-size="32"
+                  tabindex="-1"
+                  type="button"
+                >
+                  <mdc-icon
+                    name="agent-icon"
+                  />
+                </button>
+              </div>
             </div>
-          </div>
-        </li>
-      </div>
-    </ul>
+          </li>
+        </div>
+      </ul>
+    </div>
   </div>
 </div>
 `;
@@ -723,160 +735,164 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
       </span>
     </button>
   </div>
-  <ul
-    class="agent-list md-list-wrapper"
+  <div
+    class="consult-list-container"
   >
-    <div
-      class="consult-list-item-wrapper"
-    >
-      <li
-        aria-label="Agent One"
-        class="call-control-list-item md-list-item-base-wrapper"
-        data-allow-text-select="false"
-        data-disabled="false"
-        data-interactive="true"
-        data-padded="true"
-        data-shape="rectangle"
-        data-size="50"
-        role="listitem"
-        tabindex="-1"
+    <ul
+      class="agent-list md-list-wrapper"
+    >
+      <div
+        class="consult-list-item-wrapper"
       >
-        <div
-          class="call-control-list-item-start"
-          data-position="start"
+        <li
+          aria-label="Agent One"
+          class="call-control-list-item md-list-item-base-wrapper"
+          data-allow-text-select="false"
+          data-disabled="false"
+          data-interactive="true"
+          data-padded="true"
+          data-shape="rectangle"
+          data-size="50"
+          role="listitem"
+          tabindex="-1"
         >
           <div
-            aria-hidden="false"
-            aria-label=""
-            class="md-avatar-wrapper"
-            data-color="default"
-            data-size="32"
-            role="img"
+            class="call-control-list-item-start"
+            data-position="start"
           >
-            <span
-              aria-hidden="true"
-              class="md-avatar-wrapper-children"
+            <div
+              aria-hidden="false"
+              aria-label=""
+              class="md-avatar-wrapper"
+              data-color="default"
+              data-size="32"
+              role="img"
             >
-              AO
-            </span>
+              <span
+                aria-hidden="true"
+                class="md-avatar-wrapper-children"
+              >
+                AO
+              </span>
+            </div>
           </div>
-        </div>
-        <div
-          class="call-control-list-item-middle"
-          data-position="middle"
-        >
-          <mdc-text
-            class="md-text-wrapper call-control-list-item-title"
-            tagname="div"
-            type="body-large-regular"
+          <div
+            class="call-control-list-item-middle"
+            data-position="middle"
           >
-            Agent One
-          </mdc-text>
-        </div>
-        <div
-          class="call-control-list-item-end"
-          data-position="end"
-        >
+            <mdc-text
+              class="md-text-wrapper call-control-list-item-title"
+              tagname="div"
+              type="body-large-regular"
+            >
+              Agent One
+            </mdc-text>
+          </div>
           <div
-            class="hover-button"
+            class="call-control-list-item-end"
+            data-position="end"
           >
-            <button
-              class="md-button-circle-wrapper md-button-simple-wrapper"
-              data-color="join"
-              data-disabled="false"
-              data-ghost="false"
-              data-inverted="false"
-              data-multiple-children="false"
-              data-outline="false"
-              data-shallow-disabled="false"
-              data-size="32"
-              tabindex="-1"
-              type="button"
+            <div
+              class="hover-button"
             >
-              <mdc-icon
-                name="agent-icon"
-              />
-            </button>
+              <button
+                class="md-button-circle-wrapper md-button-simple-wrapper"
+                data-color="join"
+                data-disabled="false"
+                data-ghost="false"
+                data-inverted="false"
+                data-multiple-children="false"
+                data-outline="false"
+                data-shallow-disabled="false"
+                data-size="32"
+                tabindex="-1"
+                type="button"
+              >
+                <mdc-icon
+                  name="agent-icon"
+                />
+              </button>
+            </div>
           </div>
-        </div>
-      </li>
-    </div>
-    <div
-      class="consult-list-item-wrapper"
-    >
-      <li
-        aria-label="Agent Two"
-        class="call-control-list-item md-list-item-base-wrapper"
-        data-allow-text-select="false"
-        data-disabled="false"
-        data-interactive="true"
-        data-padded="true"
-        data-shape="rectangle"
-        data-size="50"
-        role="listitem"
-        tabindex="-1"
+        </li>
+      </div>
+      <div
+        class="consult-list-item-wrapper"
       >
-        <div
-          class="call-control-list-item-start"
-          data-position="start"
+        <li
+          aria-label="Agent Two"
+          class="call-control-list-item md-list-item-base-wrapper"
+          data-allow-text-select="false"
+          data-disabled="false"
+          data-interactive="true"
+          data-padded="true"
+          data-shape="rectangle"
+          data-size="50"
+          role="listitem"
+          tabindex="-1"
         >
           <div
-            aria-hidden="false"
-            aria-label=""
-            class="md-avatar-wrapper"
-            data-color="default"
-            data-size="32"
-            role="img"
+            class="call-control-list-item-start"
+            data-position="start"
           >
-            <span
-              aria-hidden="true"
-              class="md-avatar-wrapper-children"
+            <div
+              aria-hidden="false"
+              aria-label=""
+              class="md-avatar-wrapper"
+              data-color="default"
+              data-size="32"
+              role="img"
             >
-              AT
-            </span>
+              <span
+                aria-hidden="true"
+                class="md-avatar-wrapper-children"
+              >
+                AT
+              </span>
+            </div>
           </div>
-        </div>
-        <div
-          class="call-control-list-item-middle"
-          data-position="middle"
-        >
-          <mdc-text
-            class="md-text-wrapper call-control-list-item-title"
-            tagname="div"
-            type="body-large-regular"
+          <div
+            class="call-control-list-item-middle"
+            data-position="middle"
           >
-            Agent Two
-          </mdc-text>
-        </div>
-        <div
-          class="call-control-list-item-end"
-          data-position="end"
-        >
+            <mdc-text
+              class="md-text-wrapper call-control-list-item-title"
+              tagname="div"
+              type="body-large-regular"
+            >
+              Agent Two
+            </mdc-text>
+          </div>
           <div
-            class="hover-button"
+            class="call-control-list-item-end"
+            data-position="end"
           >
-            <button
-              class="md-button-circle-wrapper md-button-simple-wrapper"
-              data-color="join"
-              data-disabled="false"
-              data-ghost="false"
-              data-inverted="false"
-              data-multiple-children="false"
-              data-outline="false"
-              data-shallow-disabled="false"
-              data-size="32"
-              tabindex="-1"
-              type="button"
+            <div
+              class="hover-button"
             >
-              <mdc-icon
-                name="agent-icon"
-              />
-            </button>
+              <button
+                class="md-button-circle-wrapper md-button-simple-wrapper"
+                data-color="join"
+                data-disabled="false"
+                data-ghost="false"
+                data-inverted="false"
+                data-multiple-children="false"
+                data-outline="false"
+                data-shallow-disabled="false"
+                data-size="32"
+                tabindex="-1"
+                type="button"
+              >
+                <mdc-icon
+                  name="agent-icon"
+                />
+              </button>
+            </div>
           </div>
-        </div>
-      </li>
-    </div>
-  </ul>
+        </li>
+      </div>
+    </ul>
+  </div>
 </div>
 `;
 
@@ -975,239 +991,481 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
       </span>
     </button>
   </div>
-  <ul
-    class="agent-list md-list-wrapper"
+  <div
+    class="consult-list-container"
   >
-    <div
-      class="consult-list-item-wrapper"
-    >
-      <li
-        aria-label="Available Agent"
-        class="call-control-list-item md-list-item-base-wrapper"
-        data-allow-text-select="false"
-        data-disabled="false"
-        data-interactive="true"
-        data-padded="true"
-        data-shape="rectangle"
-        data-size="50"
-        role="listitem"
-        tabindex="-1"
+    <ul
+      class="agent-list md-list-wrapper"
+    >
+      <div
+        class="consult-list-item-wrapper"
       >
-        <div
-          class="call-control-list-item-start"
-          data-position="start"
-        >
-          <div
-            aria-hidden="false"
-            aria-label=""
-            class="md-avatar-wrapper"
-            data-color="default"
-            data-size="32"
-            role="img"
-          >
-            <span
-              aria-hidden="true"
-              class="md-avatar-wrapper-children"
-            >
-              AA
-            </span>
-          </div>
-        </div>
-        <div
-          class="call-control-list-item-middle"
-          data-position="middle"
-        >
-          <mdc-text
-            class="md-text-wrapper call-control-list-item-title"
-            tagname="div"
-            type="body-large-regular"
-          >
-            Available Agent
-          </mdc-text>
-        </div>
-        <div
-          class="call-control-list-item-end"
-          data-position="end"
+        <li
+          aria-label="Available Agent"
+          class="call-control-list-item md-list-item-base-wrapper"
+          data-allow-text-select="false"
+          data-disabled="false"
+          data-interactive="true"
+          data-padded="true"
+          data-shape="rectangle"
+          data-size="50"
+          role="listitem"
+          tabindex="-1"
         >
           <div
-            class="hover-button"
+            class="call-control-list-item-start"
+            data-position="start"
           >
-            <button
-              class="md-button-circle-wrapper md-button-simple-wrapper"
-              data-color="join"
-              data-disabled="false"
-              data-ghost="false"
-              data-inverted="false"
-              data-multiple-children="false"
-              data-outline="false"
-              data-shallow-disabled="false"
+            <div
+              aria-hidden="false"
+              aria-label=""
+              class="md-avatar-wrapper"
+              data-color="default"
               data-size="32"
-              tabindex="-1"
-              type="button"
+              role="img"
             >
-              <mdc-icon
-                name="agent-icon"
-              />
-            </button>
+              <span
+                aria-hidden="true"
+                class="md-avatar-wrapper-children"
+              >
+                AA
+              </span>
+            </div>
           </div>
-        </div>
-      </li>
-    </div>
-    <div
-      class="consult-list-item-wrapper"
-    >
-      <li
-        aria-label="Busy Agent"
-        class="call-control-list-item md-list-item-base-wrapper"
-        data-allow-text-select="false"
-        data-disabled="false"
-        data-interactive="true"
-        data-padded="true"
-        data-shape="rectangle"
-        data-size="50"
-        role="listitem"
-        tabindex="-1"
-      >
-        <div
-          class="call-control-list-item-start"
-          data-position="start"
-        >
           <div
-            aria-hidden="false"
-            aria-label=""
-            class="md-avatar-wrapper"
-            data-color="default"
-            data-size="32"
-            role="img"
+            class="call-control-list-item-middle"
+            data-position="middle"
           >
-            <span
-              aria-hidden="true"
-              class="md-avatar-wrapper-children"
+            <mdc-text
+              class="md-text-wrapper call-control-list-item-title"
+              tagname="div"
+              type="body-large-regular"
             >
-              BA
-            </span>
+              Available Agent
+            </mdc-text>
           </div>
-        </div>
-        <div
-          class="call-control-list-item-middle"
-          data-position="middle"
-        >
-          <mdc-text
-            class="md-text-wrapper call-control-list-item-title"
-            tagname="div"
-            type="body-large-regular"
-          >
-            Busy Agent
-          </mdc-text>
-        </div>
-        <div
-          class="call-control-list-item-end"
-          data-position="end"
-        >
           <div
-            class="hover-button"
+            class="call-control-list-item-end"
+            data-position="end"
           >
-            <button
-              class="md-button-circle-wrapper md-button-simple-wrapper"
-              data-color="join"
-              data-disabled="false"
-              data-ghost="false"
-              data-inverted="false"
-              data-multiple-children="false"
-              data-outline="false"
-              data-shallow-disabled="false"
-              data-size="32"
-              tabindex="-1"
-              type="button"
+            <div
+              class="hover-button"
             >
-              <mdc-icon
-                name="agent-icon"
-              />
-            </button>
+              <button
+                class="md-button-circle-wrapper md-button-simple-wrapper"
+                data-color="join"
+                data-disabled="false"
+                data-ghost="false"
+                data-inverted="false"
+                data-multiple-children="false"
+                data-outline="false"
+                data-shallow-disabled="false"
+                data-size="32"
+                tabindex="-1"
+                type="button"
+              >
+                <mdc-icon
+                  name="agent-icon"
+                />
+              </button>
+            </div>
           </div>
-        </div>
-      </li>
-    </div>
-    <div
-      class="consult-list-item-wrapper"
-    >
-      <li
-        aria-label="Idle Agent"
-        class="call-control-list-item md-list-item-base-wrapper"
-        data-allow-text-select="false"
-        data-disabled="false"
-        data-interactive="true"
-        data-padded="true"
-        data-shape="rectangle"
-        data-size="50"
-        role="listitem"
-        tabindex="-1"
+        </li>
+      </div>
+      <div
+        class="consult-list-item-wrapper"
       >
-        <div
-          class="call-control-list-item-start"
-          data-position="start"
+        <li
+          aria-label="Busy Agent"
+          class="call-control-list-item md-list-item-base-wrapper"
+          data-allow-text-select="false"
+          data-disabled="false"
+          data-interactive="true"
+          data-padded="true"
+          data-shape="rectangle"
+          data-size="50"
+          role="listitem"
+          tabindex="-1"
         >
           <div
-            aria-hidden="false"
-            aria-label=""
-            class="md-avatar-wrapper"
-            data-color="default"
-            data-size="32"
-            role="img"
+            class="call-control-list-item-start"
+            data-position="start"
+          >
+            <div
+              aria-hidden="false"
+              aria-label=""
+              class="md-avatar-wrapper"
+              data-color="default"
+              data-size="32"
+              role="img"
+            >
+              <span
+                aria-hidden="true"
+                class="md-avatar-wrapper-children"
+              >
+                BA
+              </span>
+            </div>
+          </div>
+          <div
+            class="call-control-list-item-middle"
+            data-position="middle"
           >
-            <span
-              aria-hidden="true"
-              class="md-avatar-wrapper-children"
+            <mdc-text
+              class="md-text-wrapper call-control-list-item-title"
+              tagname="div"
+              type="body-large-regular"
             >
-              IA
-            </span>
+              Busy Agent
+            </mdc-text>
           </div>
-        </div>
-        <div
-          class="call-control-list-item-middle"
-          data-position="middle"
+          <div
+            class="call-control-list-item-end"
+            data-position="end"
+          >
+            <div
+              class="hover-button"
+            >
+              <button
+                class="md-button-circle-wrapper md-button-simple-wrapper"
+                data-color="join"
+                data-disabled="false"
+                data-ghost="false"
+                data-inverted="false"
+                data-multiple-children="false"
+                data-outline="false"
+                data-shallow-disabled="false"
+                data-size="32"
+                tabindex="-1"
+                type="button"
+              >
+                <mdc-icon
+                  name="agent-icon"
+                />
+              </button>
+            </div>
+          </div>
+        </li>
+      </div>
+      <div
+        class="consult-list-item-wrapper"
+      >
+        <li
+          aria-label="Idle Agent"
+          class="call-control-list-item md-list-item-base-wrapper"
+          data-allow-text-select="false"
+          data-disabled="false"
+          data-interactive="true"
+          data-padded="true"
+          data-shape="rectangle"
+          data-size="50"
+          role="listitem"
+          tabindex="-1"
         >
-          <mdc-text
-            class="md-text-wrapper call-control-list-item-title"
-            tagname="div"
-            type="body-large-regular"
+          <div
+            class="call-control-list-item-start"
+            data-position="start"
           >
-            Idle Agent
-          </mdc-text>
-        </div>
-        <div
-          class="call-control-list-item-end"
-          data-position="end"
+            <div
+              aria-hidden="false"
+              aria-label=""
+              class="md-avatar-wrapper"
+              data-color="default"
+              data-size="32"
+              role="img"
+            >
+              <span
+                aria-hidden="true"
+                class="md-avatar-wrapper-children"
+              >
+                IA
+              </span>
+            </div>
+          </div>
+          <div
+            class="call-control-list-item-middle"
+            data-position="middle"
+          >
+            <mdc-text
+              class="md-text-wrapper call-control-list-item-title"
+              tagname="div"
+              type="body-large-regular"
+            >
+              Idle Agent
+            </mdc-text>
+          </div>
+          <div
+            class="call-control-list-item-end"
+            data-position="end"
+          >
+            <div
+              class="hover-button"
+            >
+              <button
+                class="md-button-circle-wrapper md-button-simple-wrapper"
+                data-color="join"
+                data-disabled="false"
+                data-ghost="false"
+                data-inverted="false"
+                data-multiple-children="false"
+                data-outline="false"
+                data-shallow-disabled="false"
+                data-size="32"
+                tabindex="-1"
+                type="button"
+              >
+                <mdc-icon
+                  name="agent-icon"
+                />
+              </button>
+            </div>
+          </div>
+        </li>
+      </div>
+    </ul>
+  </div>
+</div>
+`;
+
+exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elements and visual states of ConsultTransferPopoverComponent component should render with allowConsultToQueue false 1`] = `
+<div
+  class="agent-popover-content"
+>
+  <mdc-text
+    class="md-text-wrapper agent-popover-title"
+    tagname="h3"
+    type="body-large-bold"
+  >
+    Select an Agent
+  </mdc-text>
+  <div
+    class="consult-search-row"
+  >
+    <div
+      class="md-text-input-wrapper consult-search-input"
+      data-focus="false"
+      data-level="none"
+    >
+      <div
+        class="md-text-input-container"
+      >
+        <input
+          aria-labelledby="consult-search-label"
+          id="consult-search"
+          placeholder="Search..."
+          type="text"
+          value=""
+        />
+      </div>
+      <div
+        class="md-screen-reader-announcer-wrapper"
+        data-testid="screen-reader-announcer"
+        style="clip-path: inset(50%); height: 1px; overflow: hidden; position: absolute; width: 1px; white-space: nowrap;"
+      />
+    </div>
+  </div>
+  <div
+    class="consult-category-buttons"
+  >
+    <button
+      alt=""
+      aria-labelledby=""
+      class="md-button md-button--36 consult-category-button-standard consult-category-button-active"
+      data-md-event-key="md-button-17"
+      data-md-keyboard-key="agents"
+      id="md-button-17"
+      tabindex="0"
+      type="button"
+      variant="primary"
+    >
+      <span
+        class="md-button__children"
+        style="opacity: 1;"
+      >
+        Agents
+      </span>
+    </button>
+    <button
+      alt=""
+      aria-labelledby=""
+      class="md-button md-button--36 consult-category-button-wide "
+      data-md-event-key="md-button-18"
+      data-md-keyboard-key="dial-number"
+      id="md-button-18"
+      tabindex="0"
+      type="button"
+      variant="secondary"
+    >
+      <span
+        class="md-button__children"
+        style="opacity: 1;"
+      >
+        Dial Number
+      </span>
+    </button>
+  </div>
+  <div
+    class="consult-list-container"
+  >
+    <ul
+      class="agent-list md-list-wrapper"
+    >
+      <div
+        class="consult-list-item-wrapper"
+      >
+        <li
+          aria-label="Agent One"
+          class="call-control-list-item md-list-item-base-wrapper"
+          data-allow-text-select="false"
+          data-disabled="false"
+          data-interactive="true"
+          data-padded="true"
+          data-shape="rectangle"
+          data-size="50"
+          role="listitem"
+          tabindex="-1"
+        >
+          <div
+            class="call-control-list-item-start"
+            data-position="start"
+          >
+            <div
+              aria-hidden="false"
+              aria-label=""
+              class="md-avatar-wrapper"
+              data-color="default"
+              data-size="32"
+              role="img"
+            >
+              <span
+                aria-hidden="true"
+                class="md-avatar-wrapper-children"
+              >
+                AO
+              </span>
+            </div>
+          </div>
+          <div
+            class="call-control-list-item-middle"
+            data-position="middle"
+          >
+            <mdc-text
+              class="md-text-wrapper call-control-list-item-title"
+              tagname="div"
+              type="body-large-regular"
+            >
+              Agent One
+            </mdc-text>
+          </div>
+          <div
+            class="call-control-list-item-end"
+            data-position="end"
+          >
+            <div
+              class="hover-button"
+            >
+              <button
+                class="md-button-circle-wrapper md-button-simple-wrapper"
+                data-color="join"
+                data-disabled="false"
+                data-ghost="false"
+                data-inverted="false"
+                data-multiple-children="false"
+                data-outline="false"
+                data-shallow-disabled="false"
+                data-size="32"
+                tabindex="-1"
+                type="button"
+              >
+                <mdc-icon
+                  name="agent-icon"
+                />
+              </button>
+            </div>
+          </div>
+        </li>
+      </div>
+      <div
+        class="consult-list-item-wrapper"
+      >
+        <li
+          aria-label="Agent Two"
+          class="call-control-list-item md-list-item-base-wrapper"
+          data-allow-text-select="false"
+          data-disabled="false"
+          data-interactive="true"
+          data-padded="true"
+          data-shape="rectangle"
+          data-size="50"
+          role="listitem"
+          tabindex="-1"
         >
           <div
-            class="hover-button"
+            class="call-control-list-item-start"
+            data-position="start"
+          >
+            <div
+              aria-hidden="false"
+              aria-label=""
+              class="md-avatar-wrapper"
+              data-color="default"
+              data-size="32"
+              role="img"
+            >
+              <span
+                aria-hidden="true"
+                class="md-avatar-wrapper-children"
+              >
+                AT
+              </span>
+            </div>
+          </div>
+          <div
+            class="call-control-list-item-middle"
+            data-position="middle"
+          >
+            <mdc-text
+              class="md-text-wrapper call-control-list-item-title"
+              tagname="div"
+              type="body-large-regular"
+            >
+              Agent Two
+            </mdc-text>
+          </div>
+          <div
+            class="call-control-list-item-end"
+            data-position="end"
           >
-            <button
-              class="md-button-circle-wrapper md-button-simple-wrapper"
-              data-color="join"
-              data-disabled="false"
-              data-ghost="false"
-              data-inverted="false"
-              data-multiple-children="false"
-              data-outline="false"
-              data-shallow-disabled="false"
-              data-size="32"
-              tabindex="-1"
-              type="button"
+            <div
+              class="hover-button"
             >
-              <mdc-icon
-                name="agent-icon"
-              />
-            </button>
+              <button
+                class="md-button-circle-wrapper md-button-simple-wrapper"
+                data-color="join"
+                data-disabled="false"
+                data-ghost="false"
+                data-inverted="false"
+                data-multiple-children="false"
+                data-outline="false"
+                data-shallow-disabled="false"
+                data-size="32"
+                tabindex="-1"
+                type="button"
+              >
+                <mdc-icon
+                  name="agent-icon"
+                />
+              </button>
+            </div>
           </div>
-        </div>
-      </li>
-    </div>
-  </ul>
+        </li>
+      </div>
+    </ul>
+  </div>
 </div>
 `;
 
-exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elements and visual states of ConsultTransferPopoverComponent component should render with allowConsultToQueue false 1`] = `
+exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elements and visual states of ConsultTransferPopoverComponent component should render with custom empty message 1`] = `
 <div
   class="agent-popover-content"
 >
@@ -1251,9 +1509,9 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
       alt=""
       aria-labelledby=""
       class="md-button md-button--36 consult-category-button-standard consult-category-button-active"
-      data-md-event-key="md-button-17"
+      data-md-event-key="md-button-19"
       data-md-keyboard-key="agents"
-      id="md-button-17"
+      id="md-button-19"
       tabindex="0"
       type="button"
       variant="primary"
@@ -1265,13 +1523,31 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
         Agents
       </span>
     </button>
+    <button
+      alt=""
+      aria-labelledby=""
+      class="md-button md-button--36 consult-category-button-standard "
+      data-md-event-key="md-button-20"
+      data-md-keyboard-key="queues"
+      id="md-button-20"
+      tabindex="0"
+      type="button"
+      variant="secondary"
+    >
+      <span
+        class="md-button__children"
+        style="opacity: 1;"
+      >
+        Queues
+      </span>
+    </button>
     <button
       alt=""
       aria-labelledby=""
       class="md-button md-button--36 consult-category-button-wide "
-      data-md-event-key="md-button-18"
+      data-md-event-key="md-button-21"
       data-md-keyboard-key="dial-number"
-      id="md-button-18"
+      id="md-button-21"
       tabindex="0"
       type="button"
       variant="secondary"
@@ -1284,164 +1560,26 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
       </span>
     </button>
   </div>
-  <ul
-    class="agent-list md-list-wrapper"
+  <div
+    class="consult-list-container"
   >
     <div
-      class="consult-list-item-wrapper"
-    >
-      <li
-        aria-label="Agent One"
-        class="call-control-list-item md-list-item-base-wrapper"
-        data-allow-text-select="false"
-        data-disabled="false"
-        data-interactive="true"
-        data-padded="true"
-        data-shape="rectangle"
-        data-size="50"
-        role="listitem"
-        tabindex="-1"
-      >
-        <div
-          class="call-control-list-item-start"
-          data-position="start"
-        >
-          <div
-            aria-hidden="false"
-            aria-label=""
-            class="md-avatar-wrapper"
-            data-color="default"
-            data-size="32"
-            role="img"
-          >
-            <span
-              aria-hidden="true"
-              class="md-avatar-wrapper-children"
-            >
-              AO
-            </span>
-          </div>
-        </div>
-        <div
-          class="call-control-list-item-middle"
-          data-position="middle"
-        >
-          <mdc-text
-            class="md-text-wrapper call-control-list-item-title"
-            tagname="div"
-            type="body-large-regular"
-          >
-            Agent One
-          </mdc-text>
-        </div>
-        <div
-          class="call-control-list-item-end"
-          data-position="end"
-        >
-          <div
-            class="hover-button"
-          >
-            <button
-              class="md-button-circle-wrapper md-button-simple-wrapper"
-              data-color="join"
-              data-disabled="false"
-              data-ghost="false"
-              data-inverted="false"
-              data-multiple-children="false"
-              data-outline="false"
-              data-shallow-disabled="false"
-              data-size="32"
-              tabindex="-1"
-              type="button"
-            >
-              <mdc-icon
-                name="agent-icon"
-              />
-            </button>
-          </div>
-        </div>
-      </li>
-    </div>
-    <div
-      class="consult-list-item-wrapper"
-    >
-      <li
-        aria-label="Agent Two"
-        class="call-control-list-item md-list-item-base-wrapper"
-        data-allow-text-select="false"
-        data-disabled="false"
-        data-interactive="true"
-        data-padded="true"
-        data-shape="rectangle"
-        data-size="50"
-        role="listitem"
-        tabindex="-1"
+      class="consult-empty-state"
+    >
+      <div
+        class="consult-empty-state-svg"
+      />
+      <div
+        class="consult-empty-message"
       >
-        <div
-          class="call-control-list-item-start"
-          data-position="start"
-        >
-          <div
-            aria-hidden="false"
-            aria-label=""
-            class="md-avatar-wrapper"
-            data-color="default"
-            data-size="32"
-            role="img"
-          >
-            <span
-              aria-hidden="true"
-              class="md-avatar-wrapper-children"
-            >
-              AT
-            </span>
-          </div>
-        </div>
-        <div
-          class="call-control-list-item-middle"
-          data-position="middle"
-        >
-          <mdc-text
-            class="md-text-wrapper call-control-list-item-title"
-            tagname="div"
-            type="body-large-regular"
-          >
-            Agent Two
-          </mdc-text>
-        </div>
-        <div
-          class="call-control-list-item-end"
-          data-position="end"
-        >
-          <div
-            class="hover-button"
-          >
-            <button
-              class="md-button-circle-wrapper md-button-simple-wrapper"
-              data-color="join"
-              data-disabled="false"
-              data-ghost="false"
-              data-inverted="false"
-              data-multiple-children="false"
-              data-outline="false"
-              data-shallow-disabled="false"
-              data-size="32"
-              tabindex="-1"
-              type="button"
-            >
-              <mdc-icon
-                name="agent-icon"
-              />
-            </button>
-          </div>
-        </div>
-      </li>
+        No data available for consult transfer.
+      </div>
     </div>
-  </ul>
+  </div>
 </div>
 `;
 
-exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elements and visual states of ConsultTransferPopoverComponent component should render with custom empty message 1`] = `
+exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elements and visual states of ConsultTransferPopoverComponent component should render with different heading 1`] = `
 <div
   class="agent-popover-content"
 >
@@ -1450,7 +1588,7 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
     tagname="h3"
     type="body-large-bold"
   >
-    Select an Agent
+    Choose Transfer Target
   </mdc-text>
   <div
     class="consult-search-row"
@@ -1485,9 +1623,9 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
       alt=""
       aria-labelledby=""
       class="md-button md-button--36 consult-category-button-standard consult-category-button-active"
-      data-md-event-key="md-button-19"
+      data-md-event-key="md-button-8"
       data-md-keyboard-key="agents"
-      id="md-button-19"
+      id="md-button-8"
       tabindex="0"
       type="button"
       variant="primary"
@@ -1503,9 +1641,9 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
       alt=""
       aria-labelledby=""
       class="md-button md-button--36 consult-category-button-standard "
-      data-md-event-key="md-button-20"
+      data-md-event-key="md-button-9"
       data-md-keyboard-key="queues"
-      id="md-button-20"
+      id="md-button-9"
       tabindex="0"
       type="button"
       variant="secondary"
@@ -1521,9 +1659,9 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
       alt=""
       aria-labelledby=""
       class="md-button md-button--36 consult-category-button-wide "
-      data-md-event-key="md-button-21"
+      data-md-event-key="md-button-10"
       data-md-keyboard-key="dial-number"
-      id="md-button-21"
+      id="md-button-10"
       tabindex="0"
       type="button"
       variant="secondary"
@@ -1537,21 +1675,167 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
     </button>
   </div>
   <div
-    class="consult-empty-state"
+    class="consult-list-container"
   >
-    <div
-      class="consult-empty-state-svg"
-    />
-    <div
-      class="consult-empty-message"
+    <ul
+      class="agent-list md-list-wrapper"
     >
-      No data available for consult transfer.
-    </div>
+      <div
+        class="consult-list-item-wrapper"
+      >
+        <li
+          aria-label="Agent One"
+          class="call-control-list-item md-list-item-base-wrapper"
+          data-allow-text-select="false"
+          data-disabled="false"
+          data-interactive="true"
+          data-padded="true"
+          data-shape="rectangle"
+          data-size="50"
+          role="listitem"
+          tabindex="-1"
+        >
+          <div
+            class="call-control-list-item-start"
+            data-position="start"
+          >
+            <div
+              aria-hidden="false"
+              aria-label=""
+              class="md-avatar-wrapper"
+              data-color="default"
+              data-size="32"
+              role="img"
+            >
+              <span
+                aria-hidden="true"
+                class="md-avatar-wrapper-children"
+              >
+                AO
+              </span>
+            </div>
+          </div>
+          <div
+            class="call-control-list-item-middle"
+            data-position="middle"
+          >
+            <mdc-text
+              class="md-text-wrapper call-control-list-item-title"
+              tagname="div"
+              type="body-large-regular"
+            >
+              Agent One
+            </mdc-text>
+          </div>
+          <div
+            class="call-control-list-item-end"
+            data-position="end"
+          >
+            <div
+              class="hover-button"
+            >
+              <button
+                class="md-button-circle-wrapper md-button-simple-wrapper"
+                data-color="join"
+                data-disabled="false"
+                data-ghost="false"
+                data-inverted="false"
+                data-multiple-children="false"
+                data-outline="false"
+                data-shallow-disabled="false"
+                data-size="32"
+                tabindex="-1"
+                type="button"
+              >
+                <mdc-icon
+                  name="agent-icon"
+                />
+              </button>
+            </div>
+          </div>
+        </li>
+      </div>
+      <div
+        class="consult-list-item-wrapper"
+      >
+        <li
+          aria-label="Agent Two"
+          class="call-control-list-item md-list-item-base-wrapper"
+          data-allow-text-select="false"
+          data-disabled="false"
+          data-interactive="true"
+          data-padded="true"
+          data-shape="rectangle"
+          data-size="50"
+          role="listitem"
+          tabindex="-1"
+        >
+          <div
+            class="call-control-list-item-start"
+            data-position="start"
+          >
+            <div
+              aria-hidden="false"
+              aria-label=""
+              class="md-avatar-wrapper"
+              data-color="default"
+              data-size="32"
+              role="img"
+            >
+              <span
+                aria-hidden="true"
+                class="md-avatar-wrapper-children"
+              >
+                AT
+              </span>
+            </div>
+          </div>
+          <div
+            class="call-control-list-item-middle"
+            data-position="middle"
+          >
+            <mdc-text
+              class="md-text-wrapper call-control-list-item-title"
+              tagname="div"
+              type="body-large-regular"
+            >
+              Agent Two
+            </mdc-text>
+          </div>
+          <div
+            class="call-control-list-item-end"
+            data-position="end"
+          >
+            <div
+              class="hover-button"
+            >
+              <button
+                class="md-button-circle-wrapper md-button-simple-wrapper"
+                data-color="join"
+                data-disabled="false"
+                data-ghost="false"
+                data-inverted="false"
+                data-multiple-children="false"
+                data-outline="false"
+                data-shallow-disabled="false"
+                data-size="32"
+                tabindex="-1"
+                type="button"
+              >
+                <mdc-icon
+                  name="agent-icon"
+                />
+              </button>
+            </div>
+          </div>
+        </li>
+      </div>
+    </ul>
   </div>
 </div>
 `;
 
-exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elements and visual states of ConsultTransferPopoverComponent component should render with different heading 1`] = `
+exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elements and visual states of ConsultTransferPopoverComponent component should render with empty agents list 1`] = `
 <div
   class="agent-popover-content"
 >
@@ -1560,7 +1844,7 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
     tagname="h3"
     type="body-large-bold"
   >
-    Choose Transfer Target
+    Select an Agent
   </mdc-text>
   <div
     class="consult-search-row"
@@ -1595,9 +1879,9 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
       alt=""
       aria-labelledby=""
       class="md-button md-button--36 consult-category-button-standard consult-category-button-active"
-      data-md-event-key="md-button-8"
+      data-md-event-key="md-button-11"
       data-md-keyboard-key="agents"
-      id="md-button-8"
+      id="md-button-11"
       tabindex="0"
       type="button"
       variant="primary"
@@ -1613,9 +1897,9 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
       alt=""
       aria-labelledby=""
       class="md-button md-button--36 consult-category-button-standard "
-      data-md-event-key="md-button-9"
+      data-md-event-key="md-button-12"
       data-md-keyboard-key="queues"
-      id="md-button-9"
+      id="md-button-12"
       tabindex="0"
       type="button"
       variant="secondary"
@@ -1631,9 +1915,9 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
       alt=""
       aria-labelledby=""
       class="md-button md-button--36 consult-category-button-wide "
-      data-md-event-key="md-button-10"
+      data-md-event-key="md-button-13"
       data-md-keyboard-key="dial-number"
-      id="md-button-10"
+      id="md-button-13"
       tabindex="0"
       type="button"
       variant="secondary"
@@ -1646,164 +1930,26 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
       </span>
     </button>
   </div>
-  <ul
-    class="agent-list md-list-wrapper"
+  <div
+    class="consult-list-container"
   >
     <div
-      class="consult-list-item-wrapper"
-    >
-      <li
-        aria-label="Agent One"
-        class="call-control-list-item md-list-item-base-wrapper"
-        data-allow-text-select="false"
-        data-disabled="false"
-        data-interactive="true"
-        data-padded="true"
-        data-shape="rectangle"
-        data-size="50"
-        role="listitem"
-        tabindex="-1"
-      >
-        <div
-          class="call-control-list-item-start"
-          data-position="start"
-        >
-          <div
-            aria-hidden="false"
-            aria-label=""
-            class="md-avatar-wrapper"
-            data-color="default"
-            data-size="32"
-            role="img"
-          >
-            <span
-              aria-hidden="true"
-              class="md-avatar-wrapper-children"
-            >
-              AO
-            </span>
-          </div>
-        </div>
-        <div
-          class="call-control-list-item-middle"
-          data-position="middle"
-        >
-          <mdc-text
-            class="md-text-wrapper call-control-list-item-title"
-            tagname="div"
-            type="body-large-regular"
-          >
-            Agent One
-          </mdc-text>
-        </div>
-        <div
-          class="call-control-list-item-end"
-          data-position="end"
-        >
-          <div
-            class="hover-button"
-          >
-            <button
-              class="md-button-circle-wrapper md-button-simple-wrapper"
-              data-color="join"
-              data-disabled="false"
-              data-ghost="false"
-              data-inverted="false"
-              data-multiple-children="false"
-              data-outline="false"
-              data-shallow-disabled="false"
-              data-size="32"
-              tabindex="-1"
-              type="button"
-            >
-              <mdc-icon
-                name="agent-icon"
-              />
-            </button>
-          </div>
-        </div>
-      </li>
-    </div>
-    <div
-      class="consult-list-item-wrapper"
-    >
-      <li
-        aria-label="Agent Two"
-        class="call-control-list-item md-list-item-base-wrapper"
-        data-allow-text-select="false"
-        data-disabled="false"
-        data-interactive="true"
-        data-padded="true"
-        data-shape="rectangle"
-        data-size="50"
-        role="listitem"
-        tabindex="-1"
+      class="consult-empty-state"
+    >
+      <div
+        class="consult-empty-state-svg"
+      />
+      <div
+        class="consult-empty-message"
       >
-        <div
-          class="call-control-list-item-start"
-          data-position="start"
-        >
-          <div
-            aria-hidden="false"
-            aria-label=""
-            class="md-avatar-wrapper"
-            data-color="default"
-            data-size="32"
-            role="img"
-          >
-            <span
-              aria-hidden="true"
-              class="md-avatar-wrapper-children"
-            >
-              AT
-            </span>
-          </div>
-        </div>
-        <div
-          class="call-control-list-item-middle"
-          data-position="middle"
-        >
-          <mdc-text
-            class="md-text-wrapper call-control-list-item-title"
-            tagname="div"
-            type="body-large-regular"
-          >
-            Agent Two
-          </mdc-text>
-        </div>
-        <div
-          class="call-control-list-item-end"
-          data-position="end"
-        >
-          <div
-            class="hover-button"
-          >
-            <button
-              class="md-button-circle-wrapper md-button-simple-wrapper"
-              data-color="join"
-              data-disabled="false"
-              data-ghost="false"
-              data-inverted="false"
-              data-multiple-children="false"
-              data-outline="false"
-              data-shallow-disabled="false"
-              data-size="32"
-              tabindex="-1"
-              type="button"
-            >
-              <mdc-icon
-                name="agent-icon"
-              />
-            </button>
-          </div>
-        </div>
-      </li>
+        No data available for consult transfer.
+      </div>
     </div>
-  </ul>
+  </div>
 </div>
 `;
 
-exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elements and visual states of ConsultTransferPopoverComponent component should render with empty agents list 1`] = `
+exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elements and visual states of ConsultTransferPopoverComponent component should render with empty queues list 1`] = `
 <div
   class="agent-popover-content"
 >
@@ -1846,13 +1992,13 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
     <button
       alt=""
       aria-labelledby=""
-      class="md-button md-button--36 consult-category-button-standard consult-category-button-active"
-      data-md-event-key="md-button-11"
+      class="md-button md-button--36 consult-category-button-standard "
+      data-md-event-key="md-button-14"
       data-md-keyboard-key="agents"
-      id="md-button-11"
+      id="md-button-14"
       tabindex="0"
       type="button"
-      variant="primary"
+      variant="secondary"
     >
       <span
         class="md-button__children"
@@ -1864,13 +2010,13 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
     <button
       alt=""
       aria-labelledby=""
-      class="md-button md-button--36 consult-category-button-standard "
-      data-md-event-key="md-button-12"
+      class="md-button md-button--36 consult-category-button-standard consult-category-button-active"
+      data-md-event-key="md-button-15"
       data-md-keyboard-key="queues"
-      id="md-button-12"
+      id="md-button-15"
       tabindex="0"
       type="button"
-      variant="secondary"
+      variant="primary"
     >
       <span
         class="md-button__children"
@@ -1883,9 +2029,9 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
       alt=""
       aria-labelledby=""
       class="md-button md-button--36 consult-category-button-wide "
-      data-md-event-key="md-button-13"
+      data-md-event-key="md-button-16"
       data-md-keyboard-key="dial-number"
-      id="md-button-13"
+      id="md-button-16"
       tabindex="0"
       type="button"
       variant="secondary"
@@ -1899,21 +2045,25 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
     </button>
   </div>
   <div
-    class="consult-empty-state"
+    class="consult-list-container"
   >
     <div
-      class="consult-empty-state-svg"
-    />
-    <div
-      class="consult-empty-message"
+      class="consult-empty-state"
     >
-      No data available for consult transfer.
+      <div
+        class="consult-empty-state-svg"
+      />
+      <div
+        class="consult-empty-message"
+      >
+        No data available for consult transfer.
+      </div>
     </div>
   </div>
 </div>
 `;
 
-exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elements and visual states of ConsultTransferPopoverComponent component should render with empty queues list 1`] = `
+exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elements and visual states of ConsultTransferPopoverComponent component should render with single agent 1`] = `
 <div
   class="agent-popover-content"
 >
@@ -1956,13 +2106,13 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
     <button
       alt=""
       aria-labelledby=""
-      class="md-button md-button--36 consult-category-button-standard "
-      data-md-event-key="md-button-14"
+      class="md-button md-button--36 consult-category-button-standard consult-category-button-active"
+      data-md-event-key="md-button-22"
       data-md-keyboard-key="agents"
-      id="md-button-14"
+      id="md-button-22"
       tabindex="0"
       type="button"
-      variant="secondary"
+      variant="primary"
     >
       <span
         class="md-button__children"
@@ -1974,13 +2124,13 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
     <button
       alt=""
       aria-labelledby=""
-      class="md-button md-button--36 consult-category-button-standard consult-category-button-active"
-      data-md-event-key="md-button-15"
+      class="md-button md-button--36 consult-category-button-standard "
+      data-md-event-key="md-button-23"
       data-md-keyboard-key="queues"
-      id="md-button-15"
+      id="md-button-23"
       tabindex="0"
       type="button"
-      variant="primary"
+      variant="secondary"
     >
       <span
         class="md-button__children"
@@ -1993,9 +2143,9 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
       alt=""
       aria-labelledby=""
       class="md-button md-button--36 consult-category-button-wide "
-      data-md-event-key="md-button-16"
+      data-md-event-key="md-button-24"
       data-md-keyboard-key="dial-number"
-      id="md-button-16"
+      id="md-button-24"
       tabindex="0"
       type="button"
       variant="secondary"
@@ -2009,21 +2159,92 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
     </button>
   </div>
   <div
-    class="consult-empty-state"
+    class="consult-list-container"
   >
-    <div
-      class="consult-empty-state-svg"
-    />
-    <div
-      class="consult-empty-message"
+    <ul
+      class="agent-list md-list-wrapper"
     >
-      No data available for consult transfer.
-    </div>
+      <div
+        class="consult-list-item-wrapper"
+      >
+        <li
+          aria-label="Single Agent"
+          class="call-control-list-item md-list-item-base-wrapper"
+          data-allow-text-select="false"
+          data-disabled="false"
+          data-interactive="true"
+          data-padded="true"
+          data-shape="rectangle"
+          data-size="50"
+          role="listitem"
+          tabindex="-1"
+        >
+          <div
+            class="call-control-list-item-start"
+            data-position="start"
+          >
+            <div
+              aria-hidden="false"
+              aria-label=""
+              class="md-avatar-wrapper"
+              data-color="default"
+              data-size="32"
+              role="img"
+            >
+              <span
+                aria-hidden="true"
+                class="md-avatar-wrapper-children"
+              >
+                SA
+              </span>
+            </div>
+          </div>
+          <div
+            class="call-control-list-item-middle"
+            data-position="middle"
+          >
+            <mdc-text
+              class="md-text-wrapper call-control-list-item-title"
+              tagname="div"
+              type="body-large-regular"
+            >
+              Single Agent
+            </mdc-text>
+          </div>
+          <div
+            class="call-control-list-item-end"
+            data-position="end"
+          >
+            <div
+              class="hover-button"
+            >
+              <button
+                class="md-button-circle-wrapper md-button-simple-wrapper"
+                data-color="join"
+                data-disabled="false"
+                data-ghost="false"
+                data-inverted="false"
+                data-multiple-children="false"
+                data-outline="false"
+                data-shallow-disabled="false"
+                data-size="32"
+                tabindex="-1"
+                type="button"
+              >
+                <mdc-icon
+                  name="agent-icon"
+                />
+              </button>
+            </div>
+          </div>
+        </li>
+      </div>
+    </ul>
   </div>
 </div>
 `;
 
-exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elements and visual states of ConsultTransferPopoverComponent component should render with single agent 1`] = `
+exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elements and visual states of ConsultTransferPopoverComponent component should render with single queue 1`] = `
 <div
   class="agent-popover-content"
 >
@@ -2066,13 +2287,13 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
     <button
       alt=""
       aria-labelledby=""
-      class="md-button md-button--36 consult-category-button-standard consult-category-button-active"
-      data-md-event-key="md-button-22"
+      class="md-button md-button--36 consult-category-button-standard "
+      data-md-event-key="md-button-25"
       data-md-keyboard-key="agents"
-      id="md-button-22"
+      id="md-button-25"
       tabindex="0"
       type="button"
-      variant="primary"
+      variant="secondary"
     >
       <span
         class="md-button__children"
@@ -2084,13 +2305,13 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
     <button
       alt=""
       aria-labelledby=""
-      class="md-button md-button--36 consult-category-button-standard "
-      data-md-event-key="md-button-23"
+      class="md-button md-button--36 consult-category-button-standard consult-category-button-active"
+      data-md-event-key="md-button-26"
       data-md-keyboard-key="queues"
-      id="md-button-23"
+      id="md-button-26"
       tabindex="0"
       type="button"
-      variant="secondary"
+      variant="primary"
     >
       <span
         class="md-button__children"
@@ -2103,9 +2324,9 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
       alt=""
       aria-labelledby=""
       class="md-button md-button--36 consult-category-button-wide "
-      data-md-event-key="md-button-24"
+      data-md-event-key="md-button-27"
       data-md-keyboard-key="dial-number"
-      id="md-button-24"
+      id="md-button-27"
       tabindex="0"
       type="button"
       variant="secondary"
@@ -2118,89 +2339,95 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
       </span>
     </button>
   </div>
-  <ul
-    class="agent-list md-list-wrapper"
+  <div
+    class="consult-list-container"
   >
-    <div
-      class="consult-list-item-wrapper"
-    >
-      <li
-        aria-label="Single Agent"
-        class="call-control-list-item md-list-item-base-wrapper"
-        data-allow-text-select="false"
-        data-disabled="false"
-        data-interactive="true"
-        data-padded="true"
-        data-shape="rectangle"
-        data-size="50"
-        role="listitem"
-        tabindex="-1"
+    <div>
+      <ul
+        class="agent-list md-list-wrapper"
       >
         <div
-          class="call-control-list-item-start"
-          data-position="start"
+          class="consult-list-item-wrapper"
         >
-          <div
-            aria-hidden="false"
-            aria-label=""
-            class="md-avatar-wrapper"
-            data-color="default"
-            data-size="32"
-            role="img"
+          <li
+            aria-label="Single Queue"
+            class="call-control-list-item md-list-item-base-wrapper"
+            data-allow-text-select="false"
+            data-disabled="false"
+            data-interactive="true"
+            data-padded="true"
+            data-shape="rectangle"
+            data-size="50"
+            role="listitem"
+            tabindex="-1"
           >
-            <span
-              aria-hidden="true"
-              class="md-avatar-wrapper-children"
+            <div
+              class="call-control-list-item-start"
+              data-position="start"
             >
-              SA
-            </span>
-          </div>
-        </div>
-        <div
-          class="call-control-list-item-middle"
-          data-position="middle"
-        >
-          <mdc-text
-            class="md-text-wrapper call-control-list-item-title"
-            tagname="div"
-            type="body-large-regular"
-          >
-            Single Agent
-          </mdc-text>
-        </div>
-        <div
-          class="call-control-list-item-end"
-          data-position="end"
-        >
-          <div
-            class="hover-button"
-          >
-            <button
-              class="md-button-circle-wrapper md-button-simple-wrapper"
-              data-color="join"
-              data-disabled="false"
-              data-ghost="false"
-              data-inverted="false"
-              data-multiple-children="false"
-              data-outline="false"
-              data-shallow-disabled="false"
-              data-size="32"
-              tabindex="-1"
-              type="button"
+              <div
+                aria-hidden="false"
+                aria-label=""
+                class="md-avatar-wrapper"
+                data-color="default"
+                data-size="32"
+                role="img"
+              >
+                <span
+                  aria-hidden="true"
+                  class="md-avatar-wrapper-children"
+                >
+                  SQ
+                </span>
+              </div>
+            </div>
+            <div
+              class="call-control-list-item-middle"
+              data-position="middle"
             >
-              <mdc-icon
-                name="agent-icon"
-              />
-            </button>
-          </div>
+              <mdc-text
+                class="md-text-wrapper call-control-list-item-title"
+                tagname="div"
+                type="body-large-regular"
+              >
+                Single Queue
+              </mdc-text>
+            </div>
+            <div
+              class="call-control-list-item-end"
+              data-position="end"
+            >
+              <div
+                class="hover-button"
+              >
+                <button
+                  class="md-button-circle-wrapper md-button-simple-wrapper"
+                  data-color="join"
+                  data-disabled="false"
+                  data-ghost="false"
+                  data-inverted="false"
+                  data-multiple-children="false"
+                  data-outline="false"
+                  data-shallow-disabled="false"
+                  data-size="32"
+                  tabindex="-1"
+                  type="button"
+                >
+                  <mdc-icon
+                    name="agent-icon"
+                  />
+                </button>
+              </div>
+            </div>
+          </li>
         </div>
-      </li>
+      </ul>
     </div>
-  </ul>
+  </div>
 </div>
 `;
 
-exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elements and visual states of ConsultTransferPopoverComponent component should render with single queue 1`] = `
+exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elements and visual states of ConsultTransferPopoverComponent component should render without errors when rendered with minimal props 1`] = `
 <div
   class="agent-popover-content"
 >
@@ -2243,13 +2470,13 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
     <button
       alt=""
       aria-labelledby=""
-      class="md-button md-button--36 consult-category-button-standard "
-      data-md-event-key="md-button-25"
+      class="md-button md-button--36 consult-category-button-standard consult-category-button-active"
+      data-md-event-key="md-button-5"
       data-md-keyboard-key="agents"
-      id="md-button-25"
+      id="md-button-5"
       tabindex="0"
       type="button"
-      variant="secondary"
+      variant="primary"
     >
       <span
         class="md-button__children"
@@ -2261,13 +2488,13 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
     <button
       alt=""
       aria-labelledby=""
-      class="md-button md-button--36 consult-category-button-standard consult-category-button-active"
-      data-md-event-key="md-button-26"
+      class="md-button md-button--36 consult-category-button-standard "
+      data-md-event-key="md-button-6"
       data-md-keyboard-key="queues"
-      id="md-button-26"
+      id="md-button-6"
       tabindex="0"
       type="button"
-      variant="primary"
+      variant="secondary"
     >
       <span
         class="md-button__children"
@@ -2280,9 +2507,9 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
       alt=""
       aria-labelledby=""
       class="md-button md-button--36 consult-category-button-wide "
-      data-md-event-key="md-button-27"
+      data-md-event-key="md-button-7"
       data-md-keyboard-key="dial-number"
-      id="md-button-27"
+      id="md-button-7"
       tabindex="0"
       type="button"
       variant="secondary"
@@ -2295,7 +2522,9 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
       </span>
     </button>
   </div>
-  <div>
+  <div
+    class="consult-list-container"
+  >
     <ul
       class="agent-list md-list-wrapper"
     >
@@ -2303,7 +2532,7 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
         class="consult-list-item-wrapper"
       >
         <li
-          aria-label="Single Queue"
+          aria-label="Agent One"
           class="call-control-list-item md-list-item-base-wrapper"
           data-allow-text-select="false"
           data-disabled="false"
@@ -2330,7 +2559,7 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
                 aria-hidden="true"
                 class="md-avatar-wrapper-children"
               >
-                SQ
+                AO
               </span>
             </div>
           </div>
@@ -2343,7 +2572,7 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
               tagname="div"
               type="body-large-regular"
             >
-              Single Queue
+              Agent One
             </mdc-text>
           </div>
           <div
@@ -2374,260 +2603,83 @@ exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elem
           </div>
         </li>
       </div>
-    </ul>
-  </div>
-</div>
-`;
-
-exports[`ConsultTransferPopoverComponent Snapshots Rendering - Tests for UI elements and visual states of ConsultTransferPopoverComponent component should render without errors when rendered with minimal props 1`] = `
-<div
-  class="agent-popover-content"
->
-  <mdc-text
-    class="md-text-wrapper agent-popover-title"
-    tagname="h3"
-    type="body-large-bold"
-  >
-    Select an Agent
-  </mdc-text>
-  <div
-    class="consult-search-row"
-  >
-    <div
-      class="md-text-input-wrapper consult-search-input"
-      data-focus="false"
-      data-level="none"
-    >
-      <div
-        class="md-text-input-container"
-      >
-        <input
-          aria-labelledby="consult-search-label"
-          id="consult-search"
-          placeholder="Search..."
-          type="text"
-          value=""
-        />
-      </div>
       <div
-        class="md-screen-reader-announcer-wrapper"
-        data-testid="screen-reader-announcer"
-        style="clip-path: inset(50%); height: 1px; overflow: hidden; position: absolute; width: 1px; white-space: nowrap;"
-      />
-    </div>
-  </div>
-  <div
-    class="consult-category-buttons"
-  >
-    <button
-      alt=""
-      aria-labelledby=""
-      class="md-button md-button--36 consult-category-button-standard consult-category-button-active"
-      data-md-event-key="md-button-5"
-      data-md-keyboard-key="agents"
-      id="md-button-5"
-      tabindex="0"
-      type="button"
-      variant="primary"
-    >
-      <span
-        class="md-button__children"
-        style="opacity: 1;"
-      >
-        Agents
-      </span>
-    </button>
-    <button
-      alt=""
-      aria-labelledby=""
-      class="md-button md-button--36 consult-category-button-standard "
-      data-md-event-key="md-button-6"
-      data-md-keyboard-key="queues"
-      id="md-button-6"
-      tabindex="0"
-      type="button"
-      variant="secondary"
-    >
-      <span
-        class="md-button__children"
-        style="opacity: 1;"
-      >
-        Queues
-      </span>
-    </button>
-    <button
-      alt=""
-      aria-labelledby=""
-      class="md-button md-button--36 consult-category-button-wide "
-      data-md-event-key="md-button-7"
-      data-md-keyboard-key="dial-number"
-      id="md-button-7"
-      tabindex="0"
-      type="button"
-      variant="secondary"
-    >
-      <span
-        class="md-button__children"
-        style="opacity: 1;"
-      >
-        Dial Number
-      </span>
-    </button>
-  </div>
-  <ul
-    class="agent-list md-list-wrapper"
-  >
-    <div
-      class="consult-list-item-wrapper"
-    >
-      <li
-        aria-label="Agent One"
-        class="call-control-list-item md-list-item-base-wrapper"
-        data-allow-text-select="false"
-        data-disabled="false"
-        data-interactive="true"
-        data-padded="true"
-        data-shape="rectangle"
-        data-size="50"
-        role="listitem"
-        tabindex="-1"
+        class="consult-list-item-wrapper"
       >
-        <div
-          class="call-control-list-item-start"
-          data-position="start"
-        >
-          <div
-            aria-hidden="false"
-            aria-label=""
-            class="md-avatar-wrapper"
-            data-color="default"
-            data-size="32"
-            role="img"
-          >
-            <span
-              aria-hidden="true"
-              class="md-avatar-wrapper-children"
-            >
-              AO
-            </span>
-          </div>
-        </div>
-        <div
-          class="call-control-list-item-middle"
-          data-position="middle"
-        >
-          <mdc-text
-            class="md-text-wrapper call-control-list-item-title"
-            tagname="div"
-            type="body-large-regular"
-          >
-            Agent One
-          </mdc-text>
-        </div>
-        <div
-          class="call-control-list-item-end"
-          data-position="end"
+        <li
+          aria-label="Agent Two"
+          class="call-control-list-item md-list-item-base-wrapper"
+          data-allow-text-select="false"
+          data-disabled="false"
+          data-interactive="true"
+          data-padded="true"
+          data-shape="rectangle"
+          data-size="50"
+          role="listitem"
+          tabindex="-1"
         >
           <div
-            class="hover-button"
+            class="call-control-list-item-start"
+            data-position="start"
           >
-            <button
-              class="md-button-circle-wrapper md-button-simple-wrapper"
-              data-color="join"
-              data-disabled="false"
-              data-ghost="false"
-              data-inverted="false"
-              data-multiple-children="false"
-              data-outline="false"
-              data-shallow-disabled="false"
+            <div
+              aria-hidden="false"
+              aria-label=""
+              class="md-avatar-wrapper"
+              data-color="default"
               data-size="32"
-              tabindex="-1"
-              type="button"
+              role="img"
             >
-              <mdc-icon
-                name="agent-icon"
-              />
-            </button>
+              <span
+                aria-hidden="true"
+                class="md-avatar-wrapper-children"
+              >
+                AT
+              </span>
+            </div>
           </div>
-        </div>
-      </li>
-    </div>
-    <div
-      class="consult-list-item-wrapper"
-    >
-      <li
-        aria-label="Agent Two"
-        class="call-control-list-item md-list-item-base-wrapper"
-        data-allow-text-select="false"
-        data-disabled="false"
-        data-interactive="true"
-        data-padded="true"
-        data-shape="rectangle"
-        data-size="50"
-        role="listitem"
-        tabindex="-1"
-      >
-        <div
-          class="call-control-list-item-start"
-          data-position="start"
-        >
           <div
-            aria-hidden="false"
-            aria-label=""
-            class="md-avatar-wrapper"
-            data-color="default"
-            data-size="32"
-            role="img"
+            class="call-control-list-item-middle"
+            data-position="middle"
           >
-            <span
-              aria-hidden="true"
-              class="md-avatar-wrapper-children"
+            <mdc-text
+              class="md-text-wrapper call-control-list-item-title"
+              tagname="div"
+              type="body-large-regular"
             >
-              AT
-            </span>
+              Agent Two
+            </mdc-text>
           </div>
-        </div>
-        <div
-          class="call-control-list-item-middle"
-          data-position="middle"
-        >
-          <mdc-text
-            class="md-text-wrapper call-control-list-item-title"
-            tagname="div"
-            type="body-large-regular"
-          >
-            Agent Two
-          </mdc-text>
-        </div>
-        <div
-          class="call-control-list-item-end"
-          data-position="end"
-        >
           <div
-            class="hover-button"
+            class="call-control-list-item-end"
+            data-position="end"
           >
-            <button
-              class="md-button-circle-wrapper md-button-simple-wrapper"
-              data-color="join"
-              data-disabled="false"
-              data-ghost="false"
-              data-inverted="false"
-              data-multiple-children="false"
-              data-outline="false"
-              data-shallow-disabled="false"
-              data-size="32"
-              tabindex="-1"
-              type="button"
+            <div
+              class="hover-button"
             >
-              <mdc-icon
-                name="agent-icon"
-              />
-            </button>
+              <button
+                class="md-button-circle-wrapper md-button-simple-wrapper"
+                data-color="join"
+                data-disabled="false"
+                data-ghost="false"
+                data-inverted="false"
+                data-multiple-children="false"
+                data-outline="false"
+                data-shallow-disabled="false"
+                data-size="32"
+                tabindex="-1"
+                type="button"
+              >
+                <mdc-icon
+                  name="agent-icon"
+                />
+              </button>
+            </div>
           </div>
-        </div>
-      </li>
-    </div>
-  </ul>
+        </li>
+      </div>
+    </ul>
+  </div>
 </div>
 `;
 
@@ -2726,81 +2778,85 @@ exports[`ConsultTransferPopoverComponent Snapshots State Management should updat
       </span>
     </button>
   </div>
-  <ul
-    class="agent-list md-list-wrapper"
+  <div
+    class="consult-list-container"
   >
-    <div
-      class="consult-list-item-wrapper"
-    >
-      <li
-        aria-label="New Agent One"
-        class="call-control-list-item md-list-item-base-wrapper"
-        data-allow-text-select="false"
-        data-disabled="false"
-        data-interactive="true"
-        data-padded="true"
-        data-shape="rectangle"
-        data-size="50"
-        role="listitem"
-        tabindex="-1"
+    <ul
+      class="agent-list md-list-wrapper"
+    >
+      <div
+        class="consult-list-item-wrapper"
       >
-        <div
-          class="call-control-list-item-start"
-          data-position="start"
+        <li
+          aria-label="New Agent One"
+          class="call-control-list-item md-list-item-base-wrapper"
+          data-allow-text-select="false"
+          data-disabled="false"
+          data-interactive="true"
+          data-padded="true"
+          data-shape="rectangle"
+          data-size="50"
+          role="listitem"
+          tabindex="-1"
         >
           <div
-            aria-hidden="false"
-            aria-label=""
-            class="md-avatar-wrapper"
-            data-color="default"
-            data-size="32"
-            role="img"
+            class="call-control-list-item-start"
+            data-position="start"
+          >
+            <div
+              aria-hidden="false"
+              aria-label=""
+              class="md-avatar-wrapper"
+              data-color="default"
+              data-size="32"
+              role="img"
+            >
+              <span
+                aria-hidden="true"
+                class="md-avatar-wrapper-children"
+              >
+                NA
+              </span>
+            </div>
+          </div>
+          <div
+            class="call-control-list-item-middle"
+            data-position="middle"
           >
-            <span
-              aria-hidden="true"
-              class="md-avatar-wrapper-children"
+            <mdc-text
+              class="md-text-wrapper call-control-list-item-title"
             >
-              NA
-            </span>
+              New Agent One
+            </mdc-text>
           </div>
-        </div>
-        <div
-          class="call-control-list-item-middle"
-          data-position="middle"
-        >
-          <mdc-text
-            class="md-text-wrapper call-control-list-item-title"
-          >
-            New Agent One
-          </mdc-text>
-        </div>
-        <div
-          class="call-control-list-item-end"
-          data-position="end"
-        >
           <div
-            class="hover-button"
+            class="call-control-list-item-end"
+            data-position="end"
           >
-            <button
-              class="md-button-circle-wrapper md-button-simple-wrapper"
-              data-color="join"
-              data-disabled="false"
-              data-ghost="false"
-              data-inverted="false"
-              data-multiple-children="false"
-              data-outline="false"
-              data-shallow-disabled="false"
-              data-size="32"
-              tabindex="-1"
-              type="button"
+            <div
+              class="hover-button"
             >
-              <mdc-icon />
-            </button>
+              <button
+                class="md-button-circle-wrapper md-button-simple-wrapper"
+                data-color="join"
+                data-disabled="false"
+                data-ghost="false"
+                data-inverted="false"
+                data-multiple-children="false"
+                data-outline="false"
+                data-shallow-disabled="false"
+                data-size="32"
+                tabindex="-1"
+                type="button"
+              >
+                <mdc-icon />
+              </button>
+            </div>
           </div>
-        </div>
-      </li>
-    </div>
-  </ul>
+        </li>
+      </div>
+    </ul>
+  </div>
 </div>
 `;
 
@@ -2899,160 +2955,164 @@ exports[`ConsultTransferPopoverComponent Snapshots State Management should updat
       </span>
     </button>
   </div>
-  <ul
-    class="agent-list md-list-wrapper"
+  <div
+    class="consult-list-container"
   >
-    <div
-      class="consult-list-item-wrapper"
-    >
-      <li
-        aria-label="Agent One"
-        class="call-control-list-item md-list-item-base-wrapper"
-        data-allow-text-select="false"
-        data-disabled="false"
-        data-interactive="true"
-        data-padded="true"
-        data-shape="rectangle"
-        data-size="50"
-        role="listitem"
-        tabindex="-1"
+    <ul
+      class="agent-list md-list-wrapper"
+    >
+      <div
+        class="consult-list-item-wrapper"
       >
-        <div
-          class="call-control-list-item-start"
-          data-position="start"
+        <li
+          aria-label="Agent One"
+          class="call-control-list-item md-list-item-base-wrapper"
+          data-allow-text-select="false"
+          data-disabled="false"
+          data-interactive="true"
+          data-padded="true"
+          data-shape="rectangle"
+          data-size="50"
+          role="listitem"
+          tabindex="-1"
         >
           <div
-            aria-hidden="false"
-            aria-label=""
-            class="md-avatar-wrapper"
-            data-color="default"
-            data-size="32"
-            role="img"
+            class="call-control-list-item-start"
+            data-position="start"
           >
-            <span
-              aria-hidden="true"
-              class="md-avatar-wrapper-children"
+            <div
+              aria-hidden="false"
+              aria-label=""
+              class="md-avatar-wrapper"
+              data-color="default"
+              data-size="32"
+              role="img"
             >
-              AO
-            </span>
+              <span
+                aria-hidden="true"
+                class="md-avatar-wrapper-children"
+              >
+                AO
+              </span>
+            </div>
           </div>
-        </div>
-        <div
-          class="call-control-list-item-middle"
-          data-position="middle"
-        >
-          <mdc-text
-            class="md-text-wrapper call-control-list-item-title"
-            tagname="div"
-            type="body-large-regular"
+          <div
+            class="call-control-list-item-middle"
+            data-position="middle"
           >
-            Agent One
-          </mdc-text>
-        </div>
-        <div
-          class="call-control-list-item-end"
-          data-position="end"
-        >
+            <mdc-text
+              class="md-text-wrapper call-control-list-item-title"
+              tagname="div"
+              type="body-large-regular"
+            >
+              Agent One
+            </mdc-text>
+          </div>
           <div
-            class="hover-button"
+            class="call-control-list-item-end"
+            data-position="end"
           >
-            <button
-              class="md-button-circle-wrapper md-button-simple-wrapper"
-              data-color="join"
-              data-disabled="false"
-              data-ghost="false"
-              data-inverted="false"
-              data-multiple-children="false"
-              data-outline="false"
-              data-shallow-disabled="false"
-              data-size="32"
-              tabindex="-1"
-              type="button"
+            <div
+              class="hover-button"
             >
-              <mdc-icon
-                name="agent-icon"
-              />
-            </button>
+              <button
+                class="md-button-circle-wrapper md-button-simple-wrapper"
+                data-color="join"
+                data-disabled="false"
+                data-ghost="false"
+                data-inverted="false"
+                data-multiple-children="false"
+                data-outline="false"
+                data-shallow-disabled="false"
+                data-size="32"
+                tabindex="-1"
+                type="button"
+              >
+                <mdc-icon
+                  name="agent-icon"
+                />
+              </button>
+            </div>
           </div>
-        </div>
-      </li>
-    </div>
-    <div
-      class="consult-list-item-wrapper"
-    >
-      <li
-        aria-label="Agent Two"
-        class="call-control-list-item md-list-item-base-wrapper"
-        data-allow-text-select="false"
-        data-disabled="false"
-        data-interactive="true"
-        data-padded="true"
-        data-shape="rectangle"
-        data-size="50"
-        role="listitem"
-        tabindex="-1"
+        </li>
+      </div>
+      <div
+        class="consult-list-item-wrapper"
       >
-        <div
-          class="call-control-list-item-start"
-          data-position="start"
+        <li
+          aria-label="Agent Two"
+          class="call-control-list-item md-list-item-base-wrapper"
+          data-allow-text-select="false"
+          data-disabled="false"
+          data-interactive="true"
+          data-padded="true"
+          data-shape="rectangle"
+          data-size="50"
+          role="listitem"
+          tabindex="-1"
         >
           <div
-            aria-hidden="false"
-            aria-label=""
-            class="md-avatar-wrapper"
-            data-color="default"
-            data-size="32"
-            role="img"
+            class="call-control-list-item-start"
+            data-position="start"
           >
-            <span
-              aria-hidden="true"
-              class="md-avatar-wrapper-children"
+            <div
+              aria-hidden="false"
+              aria-label=""
+              class="md-avatar-wrapper"
+              data-color="default"
+              data-size="32"
+              role="img"
             >
-              AT
-            </span>
+              <span
+                aria-hidden="true"
+                class="md-avatar-wrapper-children"
+              >
+                AT
+              </span>
+            </div>
           </div>
-        </div>
-        <div
-          class="call-control-list-item-middle"
-          data-position="middle"
-        >
-          <mdc-text
-            class="md-text-wrapper call-control-list-item-title"
-            tagname="div"
-            type="body-large-regular"
+          <div
+            class="call-control-list-item-middle"
+            data-position="middle"
           >
-            Agent Two
-          </mdc-text>
-        </div>
-        <div
-          class="call-control-list-item-end"
-          data-position="end"
-        >
+            <mdc-text
+              class="md-text-wrapper call-control-list-item-title"
+              tagname="div"
+              type="body-large-regular"
+            >
+              Agent Two
+            </mdc-text>
+          </div>
           <div
-            class="hover-button"
+            class="call-control-list-item-end"
+            data-position="end"
           >
-            <button
-              class="md-button-circle-wrapper md-button-simple-wrapper"
-              data-color="join"
-              data-disabled="false"
-              data-ghost="false"
-              data-inverted="false"
-              data-multiple-children="false"
-              data-outline="false"
-              data-shallow-disabled="false"
-              data-size="32"
-              tabindex="-1"
-              type="button"
+            <div
+              class="hover-button"
             >
-              <mdc-icon
-                name="agent-icon"
-              />
-            </button>
+              <button
+                class="md-button-circle-wrapper md-button-simple-wrapper"
+                data-color="join"
+                data-disabled="false"
+                data-ghost="false"
+                data-inverted="false"
+                data-multiple-children="false"
+                data-outline="false"
+                data-shallow-disabled="false"
+                data-size="32"
+                tabindex="-1"
+                type="button"
+              >
+                <mdc-icon
+                  name="agent-icon"
+                />
+              </button>
+            </div>
           </div>
-        </div>
-      </li>
-    </div>
-  </ul>
+        </li>
+      </div>
+    </ul>
+  </div>
 </div>
 `;
 
@@ -3151,86 +3211,90 @@ exports[`ConsultTransferPopoverComponent Snapshots State Management should updat
       </span>
     </button>
   </div>
-  <div>
-    <ul
-      class="agent-list md-list-wrapper"
-    >
-      <div
-        class="consult-list-item-wrapper"
+  <div
+    class="consult-list-container"
+  >
+    <div>
+      <ul
+        class="agent-list md-list-wrapper"
       >
-        <li
-          aria-label="New Queue One"
-          class="call-control-list-item md-list-item-base-wrapper"
-          data-allow-text-select="false"
-          data-disabled="false"
-          data-interactive="true"
-          data-padded="true"
-          data-shape="rectangle"
-          data-size="50"
-          role="listitem"
-          tabindex="-1"
+        <div
+          class="consult-list-item-wrapper"
         >
-          <div
-            class="call-control-list-item-start"
-            data-position="start"
+          <li
+            aria-label="New Queue One"
+            class="call-control-list-item md-list-item-base-wrapper"
+            data-allow-text-select="false"
+            data-disabled="false"
+            data-interactive="true"
+            data-padded="true"
+            data-shape="rectangle"
+            data-size="50"
+            role="listitem"
+            tabindex="-1"
           >
             <div
-              aria-hidden="false"
-              aria-label=""
-              class="md-avatar-wrapper"
-              data-color="default"
-              data-size="32"
-              role="img"
+              class="call-control-list-item-start"
+              data-position="start"
             >
-              <span
-                aria-hidden="true"
-                class="md-avatar-wrapper-children"
+              <div
+                aria-hidden="false"
+                aria-label=""
+                class="md-avatar-wrapper"
+                data-color="default"
+                data-size="32"
+                role="img"
               >
-                NQ
-              </span>
+                <span
+                  aria-hidden="true"
+                  class="md-avatar-wrapper-children"
+                >
+                  NQ
+                </span>
+              </div>
             </div>
-          </div>
-          <div
-            class="call-control-list-item-middle"
-            data-position="middle"
-          >
-            <mdc-text
-              class="md-text-wrapper call-control-list-item-title"
-              tagname="div"
-              type="body-large-regular"
+            <div
+              class="call-control-list-item-middle"
+              data-position="middle"
             >
-              New Queue One
-            </mdc-text>
-          </div>
-          <div
-            class="call-control-list-item-end"
-            data-position="end"
-          >
+              <mdc-text
+                class="md-text-wrapper call-control-list-item-title"
+                tagname="div"
+                type="body-large-regular"
+              >
+                New Queue One
+              </mdc-text>
+            </div>
             <div
-              class="hover-button"
+              class="call-control-list-item-end"
+              data-position="end"
             >
-              <button
-                class="md-button-circle-wrapper md-button-simple-wrapper"
-                data-color="join"
-                data-disabled="false"
-                data-ghost="false"
-                data-inverted="false"
-                data-multiple-children="false"
-                data-outline="false"
-                data-shallow-disabled="false"
-                data-size="32"
-                tabindex="-1"
-                type="button"
+              <div
+                class="hover-button"
               >
-                <mdc-icon
-                  name="agent-icon"
-                />
-              </button>
+                <button
+                  class="md-button-circle-wrapper md-button-simple-wrapper"
+                  data-color="join"
+                  data-disabled="false"
+                  data-ghost="false"
+                  data-inverted="false"
+                  data-multiple-children="false"
+                  data-outline="false"
+                  data-shallow-disabled="false"
+                  data-size="32"
+                  tabindex="-1"
+                  type="button"
+                >
+                  <mdc-icon
+                    name="agent-icon"
+                  />
+                </button>
+              </div>
             </div>
-          </div>
-        </li>
-      </div>
-    </ul>
+          </li>
+        </div>
+      </ul>
+    </div>
   </div>
 </div>
 `;
diff --git a/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/call-control-consult.snapshot.tsx b/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/call-control-consult.snapshot.tsx
index dbc8e4f04..dbc6414b4 100644
--- a/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/call-control-consult.snapshot.tsx
+++ b/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/call-control-consult.snapshot.tsx
@@ -72,19 +72,49 @@ describe('CallControlConsultComponent Snapshots', () => {
   const mockOnTransfer = jest.fn();
   const mockEndConsultCall = jest.fn();
   const mockOnToggleConsultMute = jest.fn();
+  const mockConsultConference = jest.fn();
+
+  const mockControlVisibility = {
+    accept: {isVisible: true, isEnabled: true},
+    decline: {isVisible: true, isEnabled: true},
+    end: {isVisible: true, isEnabled: true},
+    muteUnmute: {isVisible: true, isEnabled: true},
+    muteUnmuteConsult: {isVisible: true, isEnabled: true},
+    holdResume: {isVisible: true, isEnabled: true},
+    consult: {isVisible: true, isEnabled: true},
+    transfer: {isVisible: true, isEnabled: true},
+    conference: {isVisible: true, isEnabled: true},
+    wrapup: {isVisible: false, isEnabled: false},
+    pauseResumeRecording: {isVisible: true, isEnabled: true},
+    endConsult: {isVisible: true, isEnabled: true},
+    recordingIndicator: {isVisible: true, isEnabled: true},
+    exitConference: {isVisible: false, isEnabled: false},
+    mergeConference: {isVisible: true, isEnabled: true},
+    mergeConferenceConsult: {isVisible: true, isEnabled: true},
+    consultTransfer: {isVisible: true, isEnabled: true},
+    consultTransferConsult: {isVisible: true, isEnabled: true},
+    switchToMainCall: {isVisible: true, isEnabled: true},
+    switchToConsult: {isVisible: true, isEnabled: true},
+    isConferenceInProgress: false,
+    isConsultInitiated: false,
+    isConsultInitiatedAndAccepted: false,
+    isConsultInitiatedOrAccepted: false,
+    isConsultReceived: false,
+    isHeld: false,
+    consultCallHeld: false,
+  };
 
   const defaultProps = {
     agentName: 'Alice',
     startTimeStamp: Date.now(),
-    onTransfer: mockOnTransfer,
+    consultTransfer: mockOnTransfer,
     endConsultCall: mockEndConsultCall,
-    onToggleConsultMute: mockOnToggleConsultMute,
-    consultCompleted: true,
-    isAgentBeingConsulted: true,
-    isEndConsultEnabled: true,
+    toggleConsultMute: mockOnToggleConsultMute,
+    consultConference: mockConsultConference,
+    switchToMainCall: jest.fn(),
     logger: mockLogger,
-    muteUnmute: true,
     isMuted: false,
+    controlVisibility: mockControlVisibility,
   };
 
   beforeEach(() => {
@@ -115,8 +145,14 @@ describe('CallControlConsultComponent Snapshots', () => {
       expect(container).toMatchSnapshot();
     });
 
-    it('should render without mute button when muteUnmute is false', async () => {
-      const propsWithoutMute = {...defaultProps, muteUnmute: false};
+    it('should render without mute button when muteUnmute is hidden', async () => {
+      const propsWithoutMute = {
+        ...defaultProps,
+        controlVisibility: {
+          ...mockControlVisibility,
+          muteUnmute: {isVisible: false, isEnabled: false},
+        },
+      };
       let screen;
       await act(async () => {
         screen = render(<CallControlConsultComponent {...propsWithoutMute} />);
@@ -128,7 +164,7 @@ describe('CallControlConsultComponent Snapshots', () => {
     });
 
     it('should render without transfer button when onTransfer is undefined', async () => {
-      const propsWithoutTransfer = {...defaultProps, onTransfer: undefined};
+      const propsWithoutTransfer = {...defaultProps, consultTransfer: undefined};
       let screen;
       await act(async () => {
         screen = render(<CallControlConsultComponent {...propsWithoutTransfer} />);
@@ -151,8 +187,14 @@ describe('CallControlConsultComponent Snapshots', () => {
       expect(container).toMatchSnapshot();
     });
 
-    it('should render when consultCompleted is false', async () => {
-      const propsIncompleteConsult = {...defaultProps, consultCompleted: false};
+    it('should render when transfer is disabled', async () => {
+      const propsIncompleteConsult = {
+        ...defaultProps,
+        controlVisibility: {
+          ...mockControlVisibility,
+          consultTransfer: {isVisible: true, isEnabled: false},
+        },
+      };
       let screen;
       await act(async () => {
         screen = render(<CallControlConsultComponent {...propsIncompleteConsult} />);
@@ -163,8 +205,14 @@ describe('CallControlConsultComponent Snapshots', () => {
       expect(container).toMatchSnapshot();
     });
 
-    it('should render when isAgentBeingConsulted is false', async () => {
-      const propsNotBeingConsulted = {...defaultProps, isAgentBeingConsulted: false};
+    it('should render with end consult hidden', async () => {
+      const propsNotBeingConsulted = {
+        ...defaultProps,
+        controlVisibility: {
+          ...mockControlVisibility,
+          endConsult: {isVisible: false, isEnabled: false},
+        },
+      };
       let screen;
       await act(async () => {
         screen = render(<CallControlConsultComponent {...propsNotBeingConsulted} />);
@@ -175,8 +223,14 @@ describe('CallControlConsultComponent Snapshots', () => {
       expect(container).toMatchSnapshot();
     });
 
-    it('should render when isEndConsultEnabled is false', async () => {
-      const propsEndConsultDisabled = {...defaultProps, isEndConsultEnabled: false};
+    it('should render when end consult is disabled', async () => {
+      const propsEndConsultDisabled = {
+        ...defaultProps,
+        controlVisibility: {
+          ...mockControlVisibility,
+          endConsult: {isVisible: true, isEnabled: false},
+        },
+      };
       let screen;
       await act(async () => {
         screen = render(<CallControlConsultComponent {...propsEndConsultDisabled} />);
@@ -233,13 +287,20 @@ describe('CallControlConsultComponent Snapshots', () => {
   });
 
   describe('State Management', () => {
-    it('should update when muteUnmute prop changes', async () => {
+    it('should update when muteUnmute visibility changes', async () => {
       let screen;
       await act(async () => {
         screen = render(<CallControlConsultComponent {...defaultProps} />);
       });
 
-      screen.rerender(<CallControlConsultComponent {...defaultProps} muteUnmute={false} />);
+      const updatedProps = {
+        ...defaultProps,
+        controlVisibility: {
+          ...mockControlVisibility,
+          muteUnmute: {isVisible: false, isEnabled: false},
+        },
+      };
+      screen.rerender(<CallControlConsultComponent {...updatedProps} />);
       const container = screen.container.querySelector('.call-control-consult');
       mockUIDProps(container);
       expect(container).toMatchSnapshot();
@@ -260,9 +321,12 @@ describe('CallControlConsultComponent Snapshots', () => {
     it('should handle combination of props: no mute, no transfer, disabled end consult', async () => {
       const complexProps = {
         ...defaultProps,
-        muteUnmute: false,
-        onTransfer: undefined,
-        isEndConsultEnabled: false,
+        consultTransfer: undefined,
+        controlVisibility: {
+          ...mockControlVisibility,
+          muteUnmute: {isVisible: false, isEnabled: false},
+          endConsult: {isVisible: true, isEnabled: false},
+        },
       };
       let screen;
       await act(async () => {
diff --git a/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/call-control-consult.tsx b/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/call-control-consult.tsx
index aa548b25d..9e0d73e90 100644
--- a/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/call-control-consult.tsx
+++ b/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/call-control-consult.tsx
@@ -57,19 +57,49 @@ describe('CallControlConsultComponent', () => {
   const mockOnTransfer = jest.fn();
   const mockEndConsultCall = jest.fn();
   const mockOnToggleConsultMute = jest.fn();
+  const mockConsultConference = jest.fn();
+
+  const mockControlVisibility = {
+    accept: {isVisible: true, isEnabled: true},
+    decline: {isVisible: true, isEnabled: true},
+    end: {isVisible: true, isEnabled: true},
+    muteUnmute: {isVisible: true, isEnabled: true},
+    muteUnmuteConsult: {isVisible: true, isEnabled: true},
+    holdResume: {isVisible: true, isEnabled: true},
+    consult: {isVisible: true, isEnabled: true},
+    transfer: {isVisible: true, isEnabled: true},
+    conference: {isVisible: true, isEnabled: true},
+    wrapup: {isVisible: false, isEnabled: false},
+    pauseResumeRecording: {isVisible: true, isEnabled: true},
+    endConsult: {isVisible: true, isEnabled: true},
+    recordingIndicator: {isVisible: true, isEnabled: true},
+    exitConference: {isVisible: false, isEnabled: false},
+    mergeConference: {isVisible: true, isEnabled: true},
+    mergeConferenceConsult: {isVisible: true, isEnabled: true},
+    consultTransfer: {isVisible: true, isEnabled: true},
+    consultTransferConsult: {isVisible: true, isEnabled: true},
+    switchToMainCall: {isVisible: true, isEnabled: true},
+    switchToConsult: {isVisible: true, isEnabled: true},
+    isConferenceInProgress: false,
+    isConsultInitiated: false,
+    isConsultInitiatedAndAccepted: false,
+    isConsultInitiatedOrAccepted: false,
+    isConsultReceived: false,
+    isHeld: false,
+    consultCallHeld: false,
+  };
 
   const defaultProps = {
     agentName: 'Alice',
     startTimeStamp: Date.now(),
-    onTransfer: mockOnTransfer,
+    consultTransfer: mockOnTransfer,
     endConsultCall: mockEndConsultCall,
-    onToggleConsultMute: mockOnToggleConsultMute,
-    consultCompleted: true,
-    isAgentBeingConsulted: true,
-    isEndConsultEnabled: true,
+    toggleConsultMute: mockOnToggleConsultMute,
+    consultConference: mockConsultConference,
+    switchToMainCall: jest.fn(),
     logger: loggerMock,
-    muteUnmute: true,
     isMuted: false,
+    controlVisibility: mockControlVisibility,
   };
 
   beforeEach(() => {
@@ -163,10 +193,16 @@ describe('CallControlConsultComponent', () => {
   });
 
   it('conditionally renders buttons based on props', async () => {
-    const propsWithoutMute = {...defaultProps, muteUnmute: false};
+    const propsWithoutMute = {
+      ...defaultProps,
+      controlVisibility: {
+        ...mockControlVisibility,
+        muteUnmuteConsult: {isVisible: false, isEnabled: false},
+      },
+    };
     const screen = await render(<CallControlConsultComponent {...propsWithoutMute} />);
 
-    // Mute button should not be rendered when muteUnmute is false
+    // Mute button should not be rendered when muteUnmuteConsult is false
     expect(screen.queryByTestId('mute-consult-btn')).not.toBeInTheDocument();
 
     // Verify remaining buttons and their attributes
@@ -183,8 +219,8 @@ describe('CallControlConsultComponent', () => {
     expect(cancelButton).toHaveClass('call-control-consult-button-cancel');
   });
 
-  it('handles case when onTransfer is undefined (covers line 52)', async () => {
-    const propsWithoutTransfer = {...defaultProps, onTransfer: undefined};
+  it('handles case when consultTransfer is undefined (covers line 52)', async () => {
+    const propsWithoutTransfer = {...defaultProps, consultTransfer: undefined};
     const screen = await render(<CallControlConsultComponent {...propsWithoutTransfer} />);
 
     // Component should still render without transfer functionality
@@ -203,8 +239,8 @@ describe('CallControlConsultComponent', () => {
     expect(cancelButton).toHaveAttribute('type', 'button');
     expect(cancelButton).toHaveClass('call-control-consult-button-cancel');
 
-    // Transfer button should NOT be present when onTransfer is undefined
-    expect(screen.queryByTestId('transfer-consult-btn')).not.toBeInTheDocument();
+    // Transfer button should be present even when consultTransfer is undefined (it's now mandatory)
+    expect(screen.queryByTestId('transfer-consult-btn')).toBeInTheDocument();
   });
 
   it('renders with muted state correctly', async () => {
@@ -225,13 +261,18 @@ describe('CallControlConsultComponent', () => {
   });
 
   it('tests button disabled states and tooltips', async () => {
-    const propsWithIncompleteConsult = {...defaultProps, consultCompleted: false};
+    const propsWithIncompleteConsult = {
+      ...defaultProps,
+      controlVisibility: {
+        ...mockControlVisibility,
+        consultTransferConsult: {isVisible: true, isEnabled: false},
+      },
+    };
     const screen = await render(<CallControlConsultComponent {...propsWithIncompleteConsult} />);
 
-    // Transfer button should be disabled when consultCompleted is false
+    // Transfer button should be disabled when consultTransferConsult.isEnabled is false
     const transferButton = screen.getByTestId('transfer-consult-btn');
     expect(transferButton).toHaveAttribute('data-disabled', 'true');
-    expect(transferButton).toHaveAttribute('disabled', '');
     expect(transferButton).toHaveAttribute('type', 'button');
     expect(transferButton).toHaveAttribute('data-color', 'primary');
 
@@ -271,11 +312,23 @@ describe('CallControlConsultComponent', () => {
     const cancelButton = screen.getByTestId('cancel-consult-btn');
     expect(cancelButton).toHaveAttribute('aria-describedby');
 
+    const mergeButton = screen.queryByTestId('conference-consult-btn');
+    expect(mergeButton).toHaveAttribute('aria-describedby');
+    expect(mergeButton).toHaveAttribute('data-disabled', 'false');
+    expect(mergeButton).toHaveAttribute('data-ghost', 'false');
+    expect(mergeButton).toHaveAttribute('data-inverted', 'false');
+    expect(mergeButton).toHaveAttribute('type', 'button');
+    expect(mergeButton).toHaveAttribute('data-color', 'primary');
+    expect(mergeButton).toHaveAttribute('data-size', '40');
+    expect(mergeButton).toHaveClass('call-control-button');
+
     // Verify tooltip labels exist and have content
     const tooltipLabels = screen.container.querySelectorAll('.md-tooltip-label p');
-    expect(tooltipLabels.length).toBe(3);
+    expect(tooltipLabels.length).toBe(5); // Updated to 5 to include switchToMainCall button
     expect(tooltipLabels[0]).toHaveTextContent('Mute');
-    expect(tooltipLabels[1]).toHaveTextContent('Transfer Consult');
-    expect(tooltipLabels[2]).toHaveTextContent('End Consult');
+    expect(tooltipLabels[1]).toHaveTextContent('Switch to Call');
+    expect(tooltipLabels[2]).toHaveTextContent('Transfer');
+    expect(tooltipLabels[3]).toHaveTextContent('Merge');
+    expect(tooltipLabels[4]).toHaveTextContent('End Consult');
   });
 });
diff --git a/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/call-control-custom.util.tsx b/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/call-control-custom.util.tsx
index d7e457f9c..4365f6e88 100644
--- a/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/call-control-custom.util.tsx
+++ b/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/call-control-custom.util.tsx
@@ -1,13 +1,11 @@
 import '@testing-library/jest-dom';
-import {BuddyDetails} from '@webex/cc-store';
+import {BuddyDetails, ContactServiceQueue} from '@webex/cc-store';
 import {mockAgents, mockQueueDetails} from '@webex/test-fixtures';
+import {ButtonConfig, ControlVisibility} from '../../../../../src/components/task/task.types';
 import {
   createConsultButtons,
   getVisibleButtons,
   createInitials,
-  handleTransferPress,
-  handleEndConsultPress,
-  handleMuteToggle,
   getConsultStatusText,
   handleListItemPress,
   shouldShowTabs,
@@ -47,47 +45,73 @@ describe('Call Control Custom Utils', () => {
     jest.clearAllMocks();
   });
 
-  describe('createConsultButtons', () => {
-    const defaultParams = {
-      isMuted: false,
-      isMuteDisabled: false,
-      consultCompleted: true,
-      isAgentBeingConsulted: true,
-      isEndConsultEnabled: true,
-      muteUnmute: true,
-    };
+  const mockControlVisibility = {
+    accept: {isVisible: true, isEnabled: true},
+    decline: {isVisible: true, isEnabled: true},
+    end: {isVisible: true, isEnabled: true},
+    muteUnmute: {isVisible: true, isEnabled: true},
+    muteUnmuteConsult: {isVisible: true, isEnabled: true},
+    holdResume: {isVisible: true, isEnabled: true},
+    consult: {isVisible: true, isEnabled: true},
+    transfer: {isVisible: true, isEnabled: true},
+    conference: {isVisible: true, isEnabled: true},
+    wrapup: {isVisible: false, isEnabled: false},
+    pauseResumeRecording: {isVisible: true, isEnabled: true},
+    endConsult: {isVisible: true, isEnabled: true},
+    recordingIndicator: {isVisible: true, isEnabled: true},
+    exitConference: {isVisible: false, isEnabled: false},
+    mergeConference: {isVisible: false, isEnabled: false},
+    mergeConferenceConsult: {isVisible: false, isEnabled: false},
+    consultTransfer: {isVisible: false, isEnabled: false},
+    consultTransferConsult: {isVisible: false, isEnabled: false},
+    switchToMainCall: {isVisible: false, isEnabled: false},
+    switchToConsult: {isVisible: false, isEnabled: false},
+    isConferenceInProgress: false,
+    isConsultInitiated: false,
+    isConsultInitiatedAndAccepted: false,
+    isConsultInitiatedOrAccepted: false,
+    isConsultReceived: false,
+    isHeld: false,
+    consultCallHeld: false,
+  };
 
+  describe('createConsultButtons', () => {
     it('should create button configuration array with all buttons visible', () => {
       const mockTransfer = jest.fn();
       const mockMuteToggle = jest.fn();
       const mockEndConsult = jest.fn();
+      const mockConsultConference = jest.fn();
+      const mockSwitchToMainCall = jest.fn();
 
       const buttons = createConsultButtons(
-        defaultParams.isMuted,
-        defaultParams.isMuteDisabled,
-        defaultParams.consultCompleted,
-        defaultParams.isAgentBeingConsulted,
-        defaultParams.isEndConsultEnabled,
-        defaultParams.muteUnmute,
+        false, // isMuted
+        mockControlVisibility,
         mockTransfer,
         mockMuteToggle,
-        mockEndConsult
+        mockEndConsult,
+        mockConsultConference,
+        mockSwitchToMainCall,
+        loggerMock
       );
 
-      expect(buttons).toHaveLength(3);
+      expect(buttons).toHaveLength(5); // Updated to 5 to include switchToMainCall button
       expect(buttons[0].key).toBe('mute');
-      expect(buttons[1].key).toBe('transfer');
-      expect(buttons[2].key).toBe('cancel');
+      expect(buttons[1].key).toBe('switchToMainCall');
+      expect(buttons[2].key).toBe('transfer');
+      expect(buttons[3].key).toBe('conference');
+      expect(buttons[4].key).toBe('cancel');
     });
 
     it('should configure mute button correctly when muted', () => {
       const buttons = createConsultButtons(
         true, // isMuted
-        false,
-        defaultParams.consultCompleted,
-        defaultParams.isAgentBeingConsulted,
-        defaultParams.isEndConsultEnabled,
-        defaultParams.muteUnmute
+        mockControlVisibility,
+        jest.fn(),
+        jest.fn(),
+        jest.fn(),
+        jest.fn(),
+        jest.fn(),
+        loggerMock
       );
 
       const muteButton = buttons.find((b) => b.key === 'mute');
@@ -99,11 +123,13 @@ describe('Call Control Custom Utils', () => {
     it('should configure mute button correctly when not muted', () => {
       const buttons = createConsultButtons(
         false, // isMuted
-        false,
-        defaultParams.consultCompleted,
-        defaultParams.isAgentBeingConsulted,
-        defaultParams.isEndConsultEnabled,
-        defaultParams.muteUnmute
+        mockControlVisibility,
+        jest.fn(),
+        jest.fn(),
+        jest.fn(),
+        jest.fn(),
+        jest.fn(),
+        loggerMock
       );
 
       const muteButton = buttons.find((b) => b.key === 'mute');
@@ -113,13 +139,16 @@ describe('Call Control Custom Utils', () => {
     });
 
     it('should disable transfer button when consult not completed', () => {
+      const customVisibility = {...mockControlVisibility, consultTransferConsult: {isVisible: true, isEnabled: false}};
       const buttons = createConsultButtons(
-        defaultParams.isMuted,
-        defaultParams.isMuteDisabled,
-        false, // consultCompleted
-        defaultParams.isAgentBeingConsulted,
-        defaultParams.isEndConsultEnabled,
-        defaultParams.muteUnmute
+        false, // isMuted
+        customVisibility,
+        jest.fn(),
+        jest.fn(),
+        jest.fn(),
+        jest.fn(),
+        jest.fn(),
+        loggerMock
       );
 
       const transferButton = buttons.find((b) => b.key === 'transfer');
@@ -127,40 +156,46 @@ describe('Call Control Custom Utils', () => {
     });
 
     it('should hide transfer button when not agent being consulted or no onTransfer', () => {
+      const customVisibility = {...mockControlVisibility, consultTransferConsult: {isVisible: false, isEnabled: false}};
       const buttons = createConsultButtons(
-        defaultParams.isMuted,
-        defaultParams.isMuteDisabled,
-        defaultParams.consultCompleted,
-        false, // isAgentBeingConsulted
-        defaultParams.isEndConsultEnabled,
-        defaultParams.muteUnmute
+        false, // isMuted
+        customVisibility,
+        jest.fn(),
+        jest.fn(),
+        jest.fn(),
+        jest.fn(),
+        jest.fn(),
+        loggerMock
       );
 
       const transferButton = buttons.find((b) => b.key === 'transfer');
-      expect(transferButton?.shouldShow).toBe(false);
+      expect(transferButton?.isVisible).toBe(false);
     });
 
-    it('should hide mute button when muteUnmute is false', () => {
+    it('should hide mute button when muteUnmuteConsult is false', () => {
+      const customVisibility = {...mockControlVisibility, muteUnmuteConsult: {isVisible: false, isEnabled: false}};
       const buttons = createConsultButtons(
-        defaultParams.isMuted,
-        defaultParams.isMuteDisabled,
-        defaultParams.consultCompleted,
-        defaultParams.isAgentBeingConsulted,
-        defaultParams.isEndConsultEnabled,
-        false // muteUnmute
+        false, // isMuted
+        customVisibility,
+        jest.fn(),
+        jest.fn(),
+        jest.fn(),
+        jest.fn(),
+        jest.fn(),
+        loggerMock
       );
 
       const muteButton = buttons.find((b) => b.key === 'mute');
-      expect(muteButton?.shouldShow).toBe(false);
+      expect(muteButton?.isVisible).toBe(false);
     });
   });
 
   describe('getVisibleButtons', () => {
     it('should filter buttons that should be shown', () => {
       const buttons = [
-        {key: 'btn1', shouldShow: true, icon: '', onClick: jest.fn(), tooltip: '', className: ''},
-        {key: 'btn2', shouldShow: false, icon: '', onClick: jest.fn(), tooltip: '', className: ''},
-        {key: 'btn3', shouldShow: true, icon: '', onClick: jest.fn(), tooltip: '', className: ''},
+        {key: 'btn1', isVisible: true, icon: '', onClick: jest.fn(), tooltip: '', className: ''},
+        {key: 'btn2', isVisible: false, icon: '', onClick: jest.fn(), tooltip: '', className: ''},
+        {key: 'btn3', isVisible: true, icon: '', onClick: jest.fn(), tooltip: '', className: ''},
       ];
 
       const visible = getVisibleButtons(buttons);
@@ -170,7 +205,7 @@ describe('Call Control Custom Utils', () => {
     });
 
     it('should return empty array when no buttons should be shown', () => {
-      const buttons = [{key: 'btn1', shouldShow: false, icon: '', onClick: jest.fn(), tooltip: '', className: ''}];
+      const buttons = [{key: 'btn1', isVisible: false, icon: '', onClick: jest.fn(), tooltip: '', className: ''}];
 
       const visible = getVisibleButtons(buttons);
       expect(visible).toHaveLength(0);
@@ -203,129 +238,13 @@ describe('Call Control Custom Utils', () => {
     });
   });
 
-  describe('handleTransferPress', () => {
-    it('should call onTransfer and log when provided', () => {
-      const mockOnTransfer = jest.fn();
-
-      handleTransferPress(mockOnTransfer, loggerMock);
-
-      expect(loggerMock.info).toHaveBeenCalledWith('CC-Widgets: CallControlConsult: transfer button clicked', {
-        module: 'call-control-consult.tsx',
-        method: 'handleTransfer',
-      });
-      expect(mockOnTransfer).toHaveBeenCalled();
-      expect(loggerMock.log).toHaveBeenCalledWith('CC-Widgets: CallControlConsult: transfer completed', {
-        module: 'call-control-consult.tsx',
-        method: 'handleTransfer',
-      });
-    });
-
-    it('should not call onTransfer when not provided', () => {
-      expect(() => {
-        handleTransferPress(undefined, loggerMock);
-      }).not.toThrow();
-
-      expect(loggerMock.info).toHaveBeenCalled();
-      expect(loggerMock.log).not.toHaveBeenCalled();
-    });
-
-    it('should throw error when onTransfer throws', () => {
-      const mockOnTransfer = jest.fn(() => {
-        throw new Error('Transfer failed');
-      });
-
-      expect(() => {
-        handleTransferPress(mockOnTransfer, loggerMock);
-      }).toThrow('Error transferring call: Error: Transfer failed');
-    });
-  });
-
-  describe('handleEndConsultPress', () => {
-    it('should call endConsultCall and log when provided', () => {
-      const mockEndConsult = jest.fn();
-
-      handleEndConsultPress(mockEndConsult, loggerMock);
-
-      expect(loggerMock.info).toHaveBeenCalledWith('CC-Widgets: CallControlConsult: end consult clicked', {
-        module: 'call-control-consult.tsx',
-        method: 'handleEndConsult',
-      });
-      expect(mockEndConsult).toHaveBeenCalled();
-      expect(loggerMock.log).toHaveBeenCalledWith('CC-Widgets: CallControlConsult: end consult completed', {
-        module: 'call-control-consult.tsx',
-        method: 'handleEndConsult',
-      });
-    });
-
-    it('should throw error when endConsultCall throws', () => {
-      const mockEndConsult = jest.fn(() => {
-        throw new Error('End consult failed');
-      });
-
-      expect(() => {
-        handleEndConsultPress(mockEndConsult, loggerMock);
-      }).toThrow('Error ending consult call: Error: End consult failed');
-    });
-  });
-
-  describe('handleMuteToggle', () => {
-    beforeEach(() => {
-      jest.useFakeTimers();
-    });
-
-    afterEach(() => {
-      jest.useRealTimers();
-    });
-
-    it('should disable button, call toggle, and re-enable after timeout', () => {
-      const mockToggleMute = jest.fn();
-      const mockSetDisabled = jest.fn();
-
-      handleMuteToggle(mockToggleMute, mockSetDisabled, loggerMock);
-
-      expect(mockSetDisabled).toHaveBeenCalledWith(true);
-      expect(mockToggleMute).toHaveBeenCalled();
-
-      jest.advanceTimersByTime(500);
-
-      expect(mockSetDisabled).toHaveBeenCalledWith(false);
-    });
-
-    it('should handle error and still re-enable button', () => {
-      const mockToggleMute = jest.fn(() => {
-        throw new Error('Mute failed');
-      });
-      const mockSetDisabled = jest.fn();
-
-      handleMuteToggle(mockToggleMute, mockSetDisabled, loggerMock);
-
-      expect(loggerMock.error).toHaveBeenCalledWith('Mute toggle failed: Error: Mute failed', {
-        module: 'call-control-consult.tsx',
-        method: 'handleConsultMuteToggle',
-      });
-
-      jest.advanceTimersByTime(500);
-      expect(mockSetDisabled).toHaveBeenCalledWith(false);
-    });
-
-    it('should not call toggle when not provided', () => {
-      const mockSetDisabled = jest.fn();
-
-      expect(() => {
-        handleMuteToggle(undefined, mockSetDisabled, loggerMock);
-      }).not.toThrow();
-
-      expect(mockSetDisabled).toHaveBeenCalledWith(true);
-    });
-  });
-
   describe('getConsultStatusText', () => {
     it('should return "Consulting" when completed', () => {
-      expect(getConsultStatusText(true)).toBe('Consulting');
+      expect(getConsultStatusText(true)).toBe('Consult requested');
     });
 
     it('should return "Consult requested" when not completed', () => {
-      expect(getConsultStatusText(false)).toBe('Consult requested');
+      expect(getConsultStatusText(false)).toBe('Consulting');
     });
   });
 
@@ -461,18 +380,66 @@ describe('Call Control Custom Utils', () => {
       const agentId = 'agent1';
       const agentName = 'John Doe';
 
-      handleAgentSelection(agentId, agentName, mockOnAgentSelect, loggerMock);
+      handleAgentSelection(agentId, agentName, false, mockOnAgentSelect, loggerMock);
+
+      expect(loggerMock.info).toHaveBeenCalledWith(`CC-Widgets: ConsultTransferPopover: agent selected: ${agentId}`, {
+        module: 'consult-transfer-popover.tsx',
+        method: 'onAgentSelect',
+      });
+      expect(mockOnAgentSelect).toHaveBeenCalledWith(agentId, agentName, false);
+    });
+
+    it('should not call onAgentSelect when not provided', () => {
+      expect(() => {
+        handleAgentSelection('agent1', 'John Doe', false, undefined, loggerMock);
+      }).not.toThrow();
+
+      expect(loggerMock.info).toHaveBeenCalled();
+    });
+  });
+
+  describe('handleQueueSelection', () => {
+    it('should call onQueueSelect and log when provided', () => {
+      const mockOnQueueSelect = jest.fn();
+      const queueId = 'queue1';
+      const queueName = 'Support Queue';
+
+      handleQueueSelection(queueId, queueName, false, mockOnQueueSelect, loggerMock);
+
+      expect(loggerMock.log).toHaveBeenCalledWith(`CC-Widgets: ConsultTransferPopover: queue selected: ${queueId}`, {
+        module: 'consult-transfer-popover.tsx',
+        method: 'onQueueSelect',
+      });
+      expect(mockOnQueueSelect).toHaveBeenCalledWith(queueId, queueName, false);
+    });
+
+    it('should not call onQueueSelect when not provided', () => {
+      expect(() => {
+        handleQueueSelection('queue1', 'Support Queue', false, undefined, loggerMock);
+      }).not.toThrow();
+
+      expect(loggerMock.log).toHaveBeenCalled();
+    });
+  });
+
+  describe('handleAgentSelection', () => {
+    it('should call onAgentSelect and log when provided', () => {
+      const mockOnAgentSelect = jest.fn();
+      const agentId = 'agent1';
+      const agentName = 'John Doe';
+
+      handleAgentSelection(agentId, agentName, false, mockOnAgentSelect, loggerMock);
 
       expect(loggerMock.info).toHaveBeenCalledWith(`CC-Widgets: ConsultTransferPopover: agent selected: ${agentId}`, {
         module: 'consult-transfer-popover.tsx',
         method: 'onAgentSelect',
       });
-      expect(mockOnAgentSelect).toHaveBeenCalledWith(agentId, agentName);
+      expect(mockOnAgentSelect).toHaveBeenCalledWith(agentId, agentName, false);
     });
 
     it('should not call onAgentSelect when not provided', () => {
       expect(() => {
-        handleAgentSelection('agent1', 'John Doe', undefined, loggerMock);
+        handleAgentSelection('agent1', 'John Doe', false, undefined, loggerMock);
       }).not.toThrow();
 
       expect(loggerMock.info).toHaveBeenCalled();
@@ -485,18 +452,18 @@ describe('Call Control Custom Utils', () => {
       const queueId = 'queue1';
       const queueName = 'Support Queue';
 
-      handleQueueSelection(queueId, queueName, mockOnQueueSelect, loggerMock);
+      handleQueueSelection(queueId, queueName, false, mockOnQueueSelect, loggerMock);
 
       expect(loggerMock.log).toHaveBeenCalledWith(`CC-Widgets: ConsultTransferPopover: queue selected: ${queueId}`, {
         module: 'consult-transfer-popover.tsx',
         method: 'onQueueSelect',
       });
-      expect(mockOnQueueSelect).toHaveBeenCalledWith(queueId, queueName);
+      expect(mockOnQueueSelect).toHaveBeenCalledWith(queueId, queueName, false);
     });
 
     it('should not call onQueueSelect when not provided', () => {
       expect(() => {
-        handleQueueSelection('queue1', 'Support Queue', undefined, loggerMock);
+        handleQueueSelection('queue1', 'Support Queue', false, undefined, loggerMock);
       }).not.toThrow();
 
       expect(loggerMock.log).toHaveBeenCalled();
@@ -774,7 +741,59 @@ describe('Call Control Custom Utils', () => {
   });
 
   describe('isQueueAvailable', () => {
+    const validQueue: ContactServiceQueue = {
+      id: 'queue1',
+      name: 'Support Queue',
+      description: 'Support Queue Description',
+      queueType: 'INBOUND',
+      checkAgentAvailability: true,
+      channelType: 'TELEPHONY',
+      serviceLevelThreshold: 30,
+      maxActiveContacts: 10,
+      maxTimeInQueue: 600,
+      defaultMusicInQueueMediaFileId: 'music1',
+      active: true,
+      monitoringPermitted: true,
+      parkingPermitted: true,
+      recordingPermitted: true,
+      recordingAllCallsPermitted: true,
+      pauseRecordingPermitted: true,
+      controlFlowScriptUrl: 'https://example.com/script',
+      ivrRequeueUrl: 'https://example.com/ivr',
+      routingType: 'LONGEST_AVAILABLE_AGENT',
+      queueRoutingType: 'TEAM_BASED',
+      callDistributionGroups: [],
+    };
+
     it('should return true for valid queue', () => {
+      expect(isQueueAvailable(validQueue)).toBe(true);
+    });
+
+    it('should return false for missing id', () => {
+      expect(
+        isQueueAvailable({
+          ...validQueue,
+          id: '',
+        })
+      ).toBeFalsy();
+    });
+
+    it('should return false for missing name', () => {
+      expect(
+        isQueueAvailable({
+          ...validQueue,
+          name: '',
+        })
+      ).toBeFalsy();
+    });
+
+    it('should return false for whitespace-only name', () => {
+      expect(
+        isQueueAvailable({
+          ...validQueue,
+          name: '   ',
+        })
+      ).toBeFalsy();
       expect(isQueueAvailable({...mockQueueDetails[0], id: 'queue1', name: 'Support Queue'})).toBe(true);
     });
 
@@ -900,4 +919,229 @@ describe('Call Control Custom Utils', () => {
       expect(mockFn).toHaveBeenCalledWith('arg1', 'arg2', 'arg3');
     });
   });
+
+  describe('Error Handling in utility functions', () => {
+    it('should handle errors in createConsultButtons', () => {
+      // Create a mock that throws when accessed
+      const badControlVisibility = new Proxy(
+        {},
+        {
+          get() {
+            throw new Error('Test error');
+          },
+        }
+      );
+
+      const buttons = createConsultButtons(
+        false,
+        badControlVisibility as unknown as ControlVisibility,
+        jest.fn(),
+        jest.fn(),
+        jest.fn(),
+        jest.fn(),
+        jest.fn(),
+        loggerMock
+      );
+
+      expect(buttons).toEqual([]);
+      expect(loggerMock.error).toHaveBeenCalledWith(
+        'CC-Widgets: CallControlCustom: Error in createConsultButtons',
+        expect.objectContaining({
+          module: 'cc-components#call-control-custom.utils.ts',
+          method: 'createConsultButtons',
+        })
+      );
+    });
+
+    it('should handle errors in getVisibleButtons', () => {
+      const badButtons = [
+        {
+          get isVisible() {
+            throw new Error('Test error');
+          },
+        },
+      ];
+
+      const result = getVisibleButtons(badButtons as unknown as ButtonConfig[], loggerMock);
+
+      expect(result).toEqual([]);
+      expect(loggerMock.error).toHaveBeenCalledWith(
+        'CC-Widgets: CallControlCustom: Error in getVisibleButtons',
+        expect.objectContaining({
+          module: 'cc-components#call-control-custom.utils.ts',
+          method: 'getVisibleButtons',
+        })
+      );
+    });
+
+    it('should handle errors in createInitials', () => {
+      const badName = {
+        split() {
+          throw new Error('Test error');
+        },
+      };
+
+      const result = createInitials(badName as unknown as string, loggerMock);
+
+      expect(result).toBe('??');
+      expect(loggerMock.error).toHaveBeenCalledWith(
+        'CC-Widgets: CallControlCustom: Error in createInitials',
+        expect.objectContaining({
+          module: 'cc-components#call-control-custom.utils.ts',
+          method: 'createInitials',
+        })
+      );
+    });
+
+    it('should handle errors in getConsultStatusText', () => {
+      // getConsultStatusText doesn't actually throw errors with undefined, it just evaluates the boolean
+      const result = getConsultStatusText(undefined as unknown as boolean, loggerMock);
+
+      // undefined is falsy, so it returns 'Consulting'
+      expect(result).toBe('Consulting');
+      // This function doesn't actually log errors for undefined input
+    });
+
+    it('should handle errors in shouldShowTabs', () => {
+      const badAgents = {
+        get length() {
+          throw new Error('Test error');
+        },
+      };
+
+      const result = shouldShowTabs(badAgents as unknown as BuddyDetails[], [], loggerMock);
+
+      expect(result).toBe(false);
+      expect(loggerMock.error).toHaveBeenCalled();
+    });
+
+    it('should handle errors in isAgentsEmpty', () => {
+      const badAgents = {
+        get length() {
+          throw new Error('Test error');
+        },
+      };
+
+      const result = isAgentsEmpty(badAgents as unknown as BuddyDetails[], loggerMock);
+
+      expect(result).toBe(true);
+      expect(loggerMock.error).toHaveBeenCalled();
+    });
+
+    it('should handle errors in isQueuesEmpty', () => {
+      const badQueues = {
+        get length() {
+          throw new Error('Test error');
+        },
+      };
+
+      const result = isQueuesEmpty(badQueues as unknown as ContactServiceQueue[], loggerMock);
+
+      expect(result).toBe(true);
+      expect(loggerMock.error).toHaveBeenCalled();
+    });
+
+    it('should handle errors in handleTabSelection', () => {
+      const mockSetSelectedTab = jest.fn(() => {
+        throw new Error('Test error');
+      });
+
+      handleTabSelection('Agents', mockSetSelectedTab, loggerMock);
+
+      expect(loggerMock.error).toHaveBeenCalledWith(
+        expect.stringContaining('Error in handleTabSelection'),
+        expect.any(Object)
+      );
+    });
+
+    it('should handle errors in handleAgentSelection', () => {
+      const mockOnAgentSelect = jest.fn(() => {
+        throw new Error('Test error');
+      });
+
+      handleAgentSelection('agent1', 'John Doe', false, mockOnAgentSelect, loggerMock);
+
+      expect(loggerMock.error).toHaveBeenCalledWith(
+        expect.stringContaining('Error in handleAgentSelection'),
+        expect.any(Object)
+      );
+    });
+
+    it('should handle errors in handleQueueSelection', () => {
+      const mockOnQueueSelect = jest.fn(() => {
+        throw new Error('Test error');
+      });
+
+      handleQueueSelection('queue1', 'Support Queue', false, mockOnQueueSelect, loggerMock);
+
+      expect(loggerMock.error).toHaveBeenCalledWith(
+        expect.stringContaining('Error in handleQueueSelection'),
+        expect.any(Object)
+      );
+    });
+
+    it('should handle errors in handleAgentSelection', () => {
+      const mockOnAgentSelect = jest.fn(() => {
+        throw new Error('Test error');
+      });
+
+      handleAgentSelection('agent1', 'John Doe', false, mockOnAgentSelect, loggerMock);
+
+      expect(loggerMock.error).toHaveBeenCalledWith(
+        expect.stringContaining('Error in handleAgentSelection'),
+        expect.any(Object)
+      );
+    });
+
+    it('should handle errors in handleQueueSelection', () => {
+      const mockOnQueueSelect = jest.fn(() => {
+        throw new Error('Test error');
+      });
+
+      handleQueueSelection('queue1', 'Support Queue', false, mockOnQueueSelect, loggerMock);
+
+      expect(loggerMock.error).toHaveBeenCalledWith(
+        expect.stringContaining('Error in handleQueueSelection'),
+        expect.any(Object)
+      );
+    });
+
+    it('should handle errors in getEmptyStateMessage', () => {
+      // When showTabs is true and selectedTab is undefined, it falls through to the default case (queues)
+      const result = getEmptyStateMessage(undefined as unknown as string, true, loggerMock);
+
+      expect(result).toBe("We can't find any queue available for now.");
+      // This function doesn't throw errors for undefined selectedTab, it just returns the default message
+    });
+
+    it('should handle errors in createAgentListData', () => {
+      const badAgents = [
+        {
+          get agentId() {
+            throw new Error('Test error');
+          },
+        },
+      ];
+
+      const result = createAgentListData(badAgents as unknown as BuddyDetails[], loggerMock);
+
+      expect(result).toEqual([]);
+      expect(loggerMock.error).toHaveBeenCalled();
+    });
+
+    it('should handle errors in createQueueListData', () => {
+      const badQueues = [
+        {
+          get id() {
+            throw new Error('Test error');
+          },
+        },
+      ];
+
+      const result = createQueueListData(badQueues as unknown as ContactServiceQueue[], loggerMock);
+
+      expect(result).toEqual([]);
+      expect(loggerMock.error).toHaveBeenCalled();
+    });
+  });
 });
diff --git a/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/consult-transfer-popover.snapshot.tsx b/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/consult-transfer-popover.snapshot.tsx
index c151ec6c7..fc1d451ba 100644
--- a/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/consult-transfer-popover.snapshot.tsx
+++ b/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/consult-transfer-popover.snapshot.tsx
@@ -79,6 +79,8 @@ describe('ConsultTransferPopoverComponent Snapshots', () => {
     getQueues: async () => ({data: [buildQueue('queue1', 'Queue One')], meta: {page: 0, totalPages: 1}}),
     onAgentSelect: mockOnAgentSelect,
     onQueueSelect: mockOnQueueSelect,
+    onDialNumberSelect: jest.fn(),
+    onEntryPointSelect: jest.fn(),
     allowConsultToQueue: true,
     logger: mockLogger,
   };
diff --git a/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/consult-transfer-popover.tsx b/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/consult-transfer-popover.tsx
index e55c65850..eb6491f86 100644
--- a/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/consult-transfer-popover.tsx
+++ b/packages/contact-center/cc-components/tests/components/task/CallControl/CallControlCustom/consult-transfer-popover.tsx
@@ -57,6 +57,8 @@ describe('ConsultTransferPopoverComponent', () => {
     }),
     onAgentSelect: mockOnAgentSelect,
     onQueueSelect: mockOnQueueSelect,
+    onDialNumberSelect: jest.fn(),
+    onEntryPointSelect: jest.fn(),
     allowConsultToQueue: true,
     logger: loggerMock,
   };
@@ -116,7 +118,7 @@ describe('ConsultTransferPopoverComponent', () => {
     // Test agent selection - click on the button inside the first agent item
     const firstAgentButton = screen.container.querySelectorAll('.call-control-list-item button')[0];
     fireEvent.click(firstAgentButton);
-    expect(mockOnAgentSelect).toHaveBeenCalledWith('agent1', 'Agent One');
+    expect(mockOnAgentSelect).toHaveBeenCalledWith('agent1', 'Agent One', false);
 
     // Test onMouseDown event handler (covers line 39) - just trigger the event
     const listItemContainer = screen.container.querySelector('.consult-list-item-wrapper');
@@ -131,7 +133,7 @@ describe('ConsultTransferPopoverComponent', () => {
     );
     const firstQueueButton = screen.container.querySelectorAll('.call-control-list-item button')[0];
     fireEvent.click(firstQueueButton);
-    expect(mockOnQueueSelect).toHaveBeenCalledWith('queue1', 'Queue One');
+    expect(mockOnQueueSelect).toHaveBeenCalledWith('queue1', 'Queue One', false);
   });
 
   it('hides Dial Number tab when consultTransferOptions.showDialNumberTab is false', async () => {
diff --git a/packages/contact-center/cc-components/tests/components/task/CallControl/__snapshots__/call-control.snapshot.tsx.snap b/packages/contact-center/cc-components/tests/components/task/CallControl/__snapshots__/call-control.snapshot.tsx.snap
index d6f51fa04..255426bdb 100644
--- a/packages/contact-center/cc-components/tests/components/task/CallControl/__snapshots__/call-control.snapshot.tsx.snap
+++ b/packages/contact-center/cc-components/tests/components/task/CallControl/__snapshots__/call-control.snapshot.tsx.snap
@@ -9,7 +9,7 @@ exports[`CallControlComponent Snapshots Interactions should handle end call butt
     class="button-group"
   >
     <button
-      aria-describedby="react-aria-:r1m:"
+      aria-describedby="react-aria-:r20:"
       aria-label="Mute"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -30,14 +30,14 @@ exports[`CallControlComponent Snapshots Interactions should handle end call butt
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1m:"
+      id="react-aria-:r20:"
     >
       <p>
         Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r1n:"
+      aria-describedby="react-aria-:r21:"
       aria-label="Hold the call"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -58,14 +58,14 @@ exports[`CallControlComponent Snapshots Interactions should handle end call butt
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1n:"
+      id="react-aria-:r21:"
     >
       <p>
         Hold the call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r1o:"
+      aria-describedby="react-aria-:r22:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Consult with another agent"
@@ -88,14 +88,14 @@ exports[`CallControlComponent Snapshots Interactions should handle end call butt
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1o:"
+      id="react-aria-:r22:"
     >
       <p>
         Consult with another agent
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r1p:"
+      aria-describedby="react-aria-:r23:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Transfer Call"
@@ -118,14 +118,14 @@ exports[`CallControlComponent Snapshots Interactions should handle end call butt
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1p:"
+      id="react-aria-:r23:"
     >
       <p>
         Transfer Call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r1q:"
+      aria-describedby="react-aria-:r24:"
       aria-label="Resume Recording"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -146,14 +146,14 @@ exports[`CallControlComponent Snapshots Interactions should handle end call butt
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1q:"
+      id="react-aria-:r24:"
     >
       <p>
         Resume Recording
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r1r:"
+      aria-describedby="react-aria-:r25:"
       aria-label="End Call"
       class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper md-focus-ring-wrapper children"
       data-color="primary"
@@ -174,7 +174,7 @@ exports[`CallControlComponent Snapshots Interactions should handle end call butt
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1r:"
+      id="react-aria-:r25:"
     >
       <p>
         End Call
@@ -182,7 +182,7 @@ exports[`CallControlComponent Snapshots Interactions should handle end call butt
     </div>
     <div
       data-tippy-root=""
-      id="tippy-80"
+      id="tippy-93"
       style="pointer-events: none; z-index: 9999; transition: none; position: absolute; left: 0px; top: 0px; margin: 0px;"
     />
   </div>
@@ -198,7 +198,7 @@ exports[`CallControlComponent Snapshots Interactions should handle hold button c
     class="button-group"
   >
     <button
-      aria-describedby="react-aria-:r1a:"
+      aria-describedby="react-aria-:r1k:"
       aria-label="Mute"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -219,14 +219,14 @@ exports[`CallControlComponent Snapshots Interactions should handle hold button c
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1a:"
+      id="react-aria-:r1k:"
     >
       <p>
         Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r1b:"
+      aria-describedby="react-aria-:r1l:"
       aria-label="Hold the call"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper md-focus-ring-wrapper children"
       data-color="primary"
@@ -247,14 +247,14 @@ exports[`CallControlComponent Snapshots Interactions should handle hold button c
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1b:"
+      id="react-aria-:r1l:"
     >
       <p>
         Hold the call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r1c:"
+      aria-describedby="react-aria-:r1m:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Consult with another agent"
@@ -277,14 +277,14 @@ exports[`CallControlComponent Snapshots Interactions should handle hold button c
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1c:"
+      id="react-aria-:r1m:"
     >
       <p>
         Consult with another agent
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r1d:"
+      aria-describedby="react-aria-:r1n:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Transfer Call"
@@ -307,14 +307,14 @@ exports[`CallControlComponent Snapshots Interactions should handle hold button c
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1d:"
+      id="react-aria-:r1n:"
     >
       <p>
         Transfer Call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r1e:"
+      aria-describedby="react-aria-:r1o:"
       aria-label="Resume Recording"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -335,14 +335,14 @@ exports[`CallControlComponent Snapshots Interactions should handle hold button c
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1e:"
+      id="react-aria-:r1o:"
     >
       <p>
         Resume Recording
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r1f:"
+      aria-describedby="react-aria-:r1p:"
       aria-label="End Call"
       class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
       data-color="primary"
@@ -363,7 +363,7 @@ exports[`CallControlComponent Snapshots Interactions should handle hold button c
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1f:"
+      id="react-aria-:r1p:"
     >
       <p>
         End Call
@@ -371,7 +371,7 @@ exports[`CallControlComponent Snapshots Interactions should handle hold button c
     </div>
     <div
       data-tippy-root=""
-      id="tippy-58"
+      id="tippy-71"
       style="pointer-events: none; z-index: 9999; transition: none; position: absolute; left: 0px; top: 0px; margin: 0px;"
     />
   </div>
@@ -387,7 +387,7 @@ exports[`CallControlComponent Snapshots Interactions should handle mute button c
     class="button-group"
   >
     <button
-      aria-describedby="react-aria-:r14:"
+      aria-describedby="react-aria-:r1e:"
       aria-label="Mute"
       class="md-button-circle-wrapper call-control-button call-control-button-disabled md-button-simple-wrapper md-focus-ring-wrapper-disabled"
       data-color="primary"
@@ -409,14 +409,14 @@ exports[`CallControlComponent Snapshots Interactions should handle mute button c
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r14:"
+      id="react-aria-:r1e:"
     >
       <p>
         Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r15:"
+      aria-describedby="react-aria-:r1f:"
       aria-label="Hold the call"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -437,14 +437,14 @@ exports[`CallControlComponent Snapshots Interactions should handle mute button c
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r15:"
+      id="react-aria-:r1f:"
     >
       <p>
         Hold the call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r16:"
+      aria-describedby="react-aria-:r1g:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Consult with another agent"
@@ -467,14 +467,14 @@ exports[`CallControlComponent Snapshots Interactions should handle mute button c
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r16:"
+      id="react-aria-:r1g:"
     >
       <p>
         Consult with another agent
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r17:"
+      aria-describedby="react-aria-:r1h:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Transfer Call"
@@ -497,14 +497,14 @@ exports[`CallControlComponent Snapshots Interactions should handle mute button c
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r17:"
+      id="react-aria-:r1h:"
     >
       <p>
         Transfer Call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r18:"
+      aria-describedby="react-aria-:r1i:"
       aria-label="Resume Recording"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -525,14 +525,14 @@ exports[`CallControlComponent Snapshots Interactions should handle mute button c
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r18:"
+      id="react-aria-:r1i:"
     >
       <p>
         Resume Recording
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r19:"
+      aria-describedby="react-aria-:r1j:"
       aria-label="End Call"
       class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
       data-color="primary"
@@ -553,7 +553,7 @@ exports[`CallControlComponent Snapshots Interactions should handle mute button c
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r19:"
+      id="react-aria-:r1j:"
     >
       <p>
         End Call
@@ -561,7 +561,7 @@ exports[`CallControlComponent Snapshots Interactions should handle mute button c
     </div>
     <div
       data-tippy-root=""
-      id="tippy-49"
+      id="tippy-62"
       style="pointer-events: none; z-index: 9999; transition: none; position: absolute; left: 0px; top: 0px; margin: 0px; transform: translate(0px, 0px);"
     />
   </div>
@@ -577,7 +577,7 @@ exports[`CallControlComponent Snapshots Interactions should handle record button
     class="button-group"
   >
     <button
-      aria-describedby="react-aria-:r1g:"
+      aria-describedby="react-aria-:r1q:"
       aria-label="Mute"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -598,14 +598,14 @@ exports[`CallControlComponent Snapshots Interactions should handle record button
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1g:"
+      id="react-aria-:r1q:"
     >
       <p>
         Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r1h:"
+      aria-describedby="react-aria-:r1r:"
       aria-label="Hold the call"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -626,14 +626,14 @@ exports[`CallControlComponent Snapshots Interactions should handle record button
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1h:"
+      id="react-aria-:r1r:"
     >
       <p>
         Hold the call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r1i:"
+      aria-describedby="react-aria-:r1s:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Consult with another agent"
@@ -656,14 +656,14 @@ exports[`CallControlComponent Snapshots Interactions should handle record button
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1i:"
+      id="react-aria-:r1s:"
     >
       <p>
         Consult with another agent
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r1j:"
+      aria-describedby="react-aria-:r1t:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Transfer Call"
@@ -686,14 +686,14 @@ exports[`CallControlComponent Snapshots Interactions should handle record button
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1j:"
+      id="react-aria-:r1t:"
     >
       <p>
         Transfer Call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r1k:"
+      aria-describedby="react-aria-:r1u:"
       aria-label="Resume Recording"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper md-focus-ring-wrapper children"
       data-color="primary"
@@ -714,14 +714,14 @@ exports[`CallControlComponent Snapshots Interactions should handle record button
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1k:"
+      id="react-aria-:r1u:"
     >
       <p>
         Resume Recording
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r1l:"
+      aria-describedby="react-aria-:r1v:"
       aria-label="End Call"
       class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
       data-color="primary"
@@ -742,7 +742,7 @@ exports[`CallControlComponent Snapshots Interactions should handle record button
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1l:"
+      id="react-aria-:r1v:"
     >
       <p>
         End Call
@@ -750,7 +750,7 @@ exports[`CallControlComponent Snapshots Interactions should handle record button
     </div>
     <div
       data-tippy-root=""
-      id="tippy-71"
+      id="tippy-84"
       style="pointer-events: none; z-index: 9999; transition: none; position: absolute; left: 0px; top: 0px; margin: 0px;"
     />
   </div>
@@ -978,7 +978,7 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     class="button-group"
   >
     <button
-      aria-describedby="react-aria-:ru:"
+      aria-describedby="react-aria-:r18:"
       aria-label="Mute"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -999,14 +999,14 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:ru:"
+      id="react-aria-:r18:"
     >
       <p>
         Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rv:"
+      aria-describedby="react-aria-:r19:"
       aria-label="Hold the call"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -1027,14 +1027,14 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rv:"
+      id="react-aria-:r19:"
     >
       <p>
         Hold the call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r10:"
+      aria-describedby="react-aria-:r1a:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Consult with another agent"
@@ -1057,14 +1057,14 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r10:"
+      id="react-aria-:r1a:"
     >
       <p>
         Consult with another agent
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r11:"
+      aria-describedby="react-aria-:r1b:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Transfer Chat"
@@ -1087,14 +1087,14 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r11:"
+      id="react-aria-:r1b:"
     >
       <p>
         Transfer Chat
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r12:"
+      aria-describedby="react-aria-:r1c:"
       aria-label="Resume Recording"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -1115,14 +1115,14 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r12:"
+      id="react-aria-:r1c:"
     >
       <p>
         Resume Recording
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r13:"
+      aria-describedby="react-aria-:r1d:"
       aria-label="End Chat"
       class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
       data-color="primary"
@@ -1143,7 +1143,7 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r13:"
+      id="react-aria-:r1d:"
     >
       <p>
         End Chat
@@ -1154,13 +1154,6 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
 `;
 
 exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and visual states of CallControl component should render with consultation accepted 1`] = `
-<div
-  class="call-control-container"
-  data-testid="call-control-container"
-/>
-`;
-
-exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and visual states of CallControl component should render with consultation initiated 1`] = `
 <div
   class="call-control-container"
   data-testid="call-control-container"
@@ -1169,11 +1162,11 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     class="button-group"
   >
     <button
-      aria-describedby="react-aria-:ro:"
+      aria-describedby="react-aria-:r14:"
       aria-label="Mute"
-      class="md-button-circle-wrapper call-control-button call-control-button-disabled md-button-simple-wrapper"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
-      data-disabled="true"
+      data-disabled="false"
       data-ghost="false"
       data-inverted="false"
       data-multiple-children="false"
@@ -1181,7 +1174,6 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
       data-shallow-disabled="false"
       data-size="40"
       data-testid="call-control:mute-toggle"
-      disabled=""
       type="button"
     >
       <mdc-icon
@@ -1191,20 +1183,20 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:ro:"
+      id="react-aria-:r14:"
     >
       <p>
         Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rp:"
+      aria-describedby="react-aria-:r15:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Transfer Call"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
-      data-disabled="true"
+      data-disabled="false"
       data-ghost="false"
       data-inverted="false"
       data-multiple-children="false"
@@ -1212,7 +1204,6 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
       data-shallow-disabled="false"
       data-size="40"
       data-testid="call-control:transfer"
-      disabled=""
       type="button"
     >
       <mdc-icon
@@ -1222,18 +1213,18 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rp:"
+      id="react-aria-:r15:"
     >
       <p>
         Transfer Call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rq:"
+      aria-describedby="react-aria-:r16:"
       aria-label="Resume Recording"
-      class="md-button-circle-wrapper call-control-button call-control-button-disabled md-button-simple-wrapper"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
-      data-disabled="true"
+      data-disabled="false"
       data-ghost="false"
       data-inverted="false"
       data-multiple-children="false"
@@ -1241,7 +1232,6 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
       data-shallow-disabled="false"
       data-size="40"
       data-testid="call-control:recording-toggle"
-      disabled=""
       type="button"
     >
       <mdc-icon
@@ -1251,18 +1241,18 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rq:"
+      id="react-aria-:r16:"
     >
       <p>
         Resume Recording
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rr:"
+      aria-describedby="react-aria-:r17:"
       aria-label="End Call"
-      class="md-button-circle-wrapper call-control-button-cancel call-control-button-cancel-disabled md-button-simple-wrapper"
+      class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
       data-color="primary"
-      data-disabled="true"
+      data-disabled="false"
       data-ghost="false"
       data-inverted="false"
       data-multiple-children="false"
@@ -1270,7 +1260,6 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
       data-shallow-disabled="false"
       data-size="40"
       data-testid="call-control:end-call"
-      disabled=""
       type="button"
     >
       <mdc-icon
@@ -1280,7 +1269,7 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rr:"
+      id="react-aria-:r17:"
     >
       <p>
         End Call
@@ -1290,7 +1279,7 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
 </div>
 `;
 
-exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and visual states of CallControl component should render with held state 1`] = `
+exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and visual states of CallControl component should render with consultation initiated 1`] = `
 <div
   class="call-control-container"
   data-testid="call-control-container"
@@ -1299,7 +1288,7 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     class="button-group"
   >
     <button
-      aria-describedby="react-aria-:rc:"
+      aria-describedby="react-aria-:ru:"
       aria-label="Mute"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -1320,15 +1309,15 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rc:"
+      id="react-aria-:ru:"
     >
       <p>
         Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rd:"
-      aria-label="Resume the call"
+      aria-describedby="react-aria-:rv:"
+      aria-label="Hold the call"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -1343,19 +1332,19 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     >
       <mdc-icon
         class="call-control-button-icon"
-        name="play-bold"
+        name="pause-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rd:"
+      id="react-aria-:rv:"
     >
       <p>
-        Resume the call
+        Hold the call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:re:"
+      aria-describedby="react-aria-:r10:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Consult with another agent"
@@ -1378,14 +1367,14 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:re:"
+      id="react-aria-:r10:"
     >
       <p>
         Consult with another agent
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rf:"
+      aria-describedby="react-aria-:r11:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Transfer Call"
@@ -1408,14 +1397,14 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rf:"
+      id="react-aria-:r11:"
     >
       <p>
         Transfer Call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rg:"
+      aria-describedby="react-aria-:r12:"
       aria-label="Resume Recording"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -1436,18 +1425,18 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rg:"
+      id="react-aria-:r12:"
     >
       <p>
         Resume Recording
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rh:"
+      aria-describedby="react-aria-:r13:"
       aria-label="End Call"
-      class="md-button-circle-wrapper call-control-button-cancel call-control-button-cancel-disabled md-button-simple-wrapper"
+      class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
       data-color="primary"
-      data-disabled="true"
+      data-disabled="false"
       data-ghost="false"
       data-inverted="false"
       data-multiple-children="false"
@@ -1455,7 +1444,6 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
       data-shallow-disabled="false"
       data-size="40"
       data-testid="call-control:end-call"
-      disabled=""
       type="button"
     >
       <mdc-icon
@@ -1465,7 +1453,7 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rh:"
+      id="react-aria-:r13:"
     >
       <p>
         End Call
@@ -1475,7 +1463,7 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
 </div>
 `;
 
-exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and visual states of CallControl component should render with limited control visibility 1`] = `
+exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and visual states of CallControl component should render with held state 1`] = `
 <div
   class="call-control-container"
   data-testid="call-control-container"
@@ -1484,7 +1472,7 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     class="button-group"
   >
     <button
-      aria-describedby="react-aria-:rs:"
+      aria-describedby="react-aria-:rc:"
       aria-label="Mute"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -1505,16 +1493,16 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rs:"
+      id="react-aria-:rc:"
     >
       <p>
         Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rt:"
-      aria-label="End Call"
-      class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
+      aria-describedby="react-aria-:rd:"
+      aria-label="Hold the call"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
       data-ghost="false"
@@ -1523,38 +1511,28 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
       data-outline="false"
       data-shallow-disabled="false"
       data-size="40"
-      data-testid="call-control:end-call"
+      data-testid="call-control:hold-toggle"
       type="button"
     >
       <mdc-icon
-        class="call-control-button-cancel-icon"
-        name="cancel-regular"
+        class="call-control-button-icon"
+        name="pause-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rt:"
+      id="react-aria-:rd:"
     >
       <p>
-        End Call
+        Hold the call
       </p>
     </div>
-  </div>
-</div>
-`;
-
-exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and visual states of CallControl component should render with muted state 1`] = `
-<div
-  class="call-control-container"
-  data-testid="call-control-container"
->
-  <div
-    class="button-group"
-  >
     <button
-      aria-describedby="react-aria-:r6:"
-      aria-label="Unmute"
-      class="md-button-circle-wrapper call-control-button-muted md-button-simple-wrapper"
+      aria-describedby="react-aria-:re:"
+      aria-expanded="false"
+      aria-haspopup="dialog"
+      aria-label="Consult with another agent"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
       data-ghost="false"
@@ -1563,25 +1541,27 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
       data-outline="false"
       data-shallow-disabled="false"
       data-size="40"
-      data-testid="call-control:mute-toggle"
+      data-testid="call-control:consult"
       type="button"
     >
       <mdc-icon
-        class="call-control-button-muted-icon"
-        name="microphone-muted-bold"
+        class="call-control-button-icon"
+        name="headset-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r6:"
+      id="react-aria-:re:"
     >
       <p>
-        Unmute
+        Consult with another agent
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r7:"
-      aria-label="Hold the call"
+      aria-describedby="react-aria-:rf:"
+      aria-expanded="false"
+      aria-haspopup="dialog"
+      aria-label="Transfer Call"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -1591,24 +1571,527 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
       data-outline="false"
       data-shallow-disabled="false"
       data-size="40"
-      data-testid="call-control:hold-toggle"
+      data-testid="call-control:transfer"
       type="button"
     >
       <mdc-icon
         class="call-control-button-icon"
-        name="pause-bold"
+        name="next-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r7:"
+      id="react-aria-:rf:"
+    >
+      <p>
+        Transfer Call
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rg:"
+      aria-label="Resume Recording"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="call-control:recording-toggle"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="record-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rg:"
+    >
+      <p>
+        Resume Recording
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rh:"
+      aria-label="End Call"
+      class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="call-control:end-call"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-cancel-icon"
+        name="cancel-regular"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rh:"
+    >
+      <p>
+        End Call
+      </p>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and visual states of CallControl component should render with limited control visibility 1`] = `
+<div
+  class="call-control-container"
+  data-testid="call-control-container"
+>
+  <div
+    class="button-group"
+  />
+</div>
+`;
+
+exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and visual states of CallControl component should render with muted state 1`] = `
+<div
+  class="call-control-container"
+  data-testid="call-control-container"
+>
+  <div
+    class="button-group"
+  >
+    <button
+      aria-describedby="react-aria-:r6:"
+      aria-label="Unmute"
+      class="md-button-circle-wrapper call-control-button-muted md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="call-control:mute-toggle"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-muted-icon"
+        name="microphone-muted-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r6:"
+    >
+      <p>
+        Unmute
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r7:"
+      aria-label="Hold the call"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="call-control:hold-toggle"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="pause-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r7:"
+    >
+      <p>
+        Hold the call
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r8:"
+      aria-expanded="false"
+      aria-haspopup="dialog"
+      aria-label="Consult with another agent"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="call-control:consult"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="headset-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r8:"
+    >
+      <p>
+        Consult with another agent
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:r9:"
+      aria-expanded="false"
+      aria-haspopup="dialog"
+      aria-label="Transfer Call"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="call-control:transfer"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="next-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:r9:"
+    >
+      <p>
+        Transfer Call
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:ra:"
+      aria-label="Resume Recording"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="call-control:recording-toggle"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="record-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:ra:"
+    >
+      <p>
+        Resume Recording
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rb:"
+      aria-label="End Call"
+      class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="call-control:end-call"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-cancel-icon"
+        name="cancel-regular"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rb:"
+    >
+      <p>
+        End Call
+      </p>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and visual states of CallControl component should render with recording state 1`] = `
+<div
+  class="call-control-container"
+  data-testid="call-control-container"
+>
+  <div
+    class="button-group"
+  >
+    <button
+      aria-describedby="react-aria-:ri:"
+      aria-label="Mute"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="call-control:mute-toggle"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="microphone-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:ri:"
+    >
+      <p>
+        Mute
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rj:"
+      aria-label="Hold the call"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="call-control:hold-toggle"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="pause-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rj:"
+    >
+      <p>
+        Hold the call
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rk:"
+      aria-expanded="false"
+      aria-haspopup="dialog"
+      aria-label="Consult with another agent"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="call-control:consult"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="headset-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rk:"
+    >
+      <p>
+        Consult with another agent
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rl:"
+      aria-expanded="false"
+      aria-haspopup="dialog"
+      aria-label="Transfer Call"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="call-control:transfer"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="next-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rl:"
+    >
+      <p>
+        Transfer Call
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rm:"
+      aria-label="Pause Recording"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="call-control:recording-toggle"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="record-paused-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rm:"
+    >
+      <p>
+        Pause Recording
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rn:"
+      aria-label="End Call"
+      class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="call-control:end-call"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-cancel-icon"
+        name="cancel-regular"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rn:"
+    >
+      <p>
+        End Call
+      </p>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and visual states of CallControl component should render with wrapup mode 1`] = `
+<div
+  class="call-control-container"
+  data-testid="call-control-container"
+>
+  <div
+    class="button-group"
+  >
+    <button
+      aria-describedby="react-aria-:ro:"
+      aria-label="Mute"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="call-control:mute-toggle"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="microphone-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:ro:"
+    >
+      <p>
+        Mute
+      </p>
+    </div>
+    <button
+      aria-describedby="react-aria-:rp:"
+      aria-label="Hold the call"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      data-color="primary"
+      data-disabled="false"
+      data-ghost="false"
+      data-inverted="false"
+      data-multiple-children="false"
+      data-outline="false"
+      data-shallow-disabled="false"
+      data-size="40"
+      data-testid="call-control:hold-toggle"
+      type="button"
+    >
+      <mdc-icon
+        class="call-control-button-icon"
+        name="pause-bold"
+      />
+    </button>
+    <div
+      class="md-tooltip-label"
+      id="react-aria-:rp:"
     >
       <p>
         Hold the call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r8:"
+      aria-describedby="react-aria-:rq:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Consult with another agent"
@@ -1631,14 +2114,14 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r8:"
+      id="react-aria-:rq:"
     >
       <p>
         Consult with another agent
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r9:"
+      aria-describedby="react-aria-:rr:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Transfer Call"
@@ -1661,14 +2144,14 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r9:"
+      id="react-aria-:rr:"
     >
       <p>
         Transfer Call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:ra:"
+      aria-describedby="react-aria-:rs:"
       aria-label="Resume Recording"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -1689,14 +2172,14 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:ra:"
+      id="react-aria-:rs:"
     >
       <p>
         Resume Recording
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rb:"
+      aria-describedby="react-aria-:rt:"
       aria-label="End Call"
       class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
       data-color="primary"
@@ -1717,7 +2200,7 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rb:"
+      id="react-aria-:rt:"
     >
       <p>
         End Call
@@ -1727,7 +2210,7 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
 </div>
 `;
 
-exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and visual states of CallControl component should render with recording state 1`] = `
+exports[`CallControlComponent Snapshots State Management should handle combination of states: muted, held, and recording 1`] = `
 <div
   class="call-control-container"
   data-testid="call-control-container"
@@ -1736,9 +2219,9 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     class="button-group"
   >
     <button
-      aria-describedby="react-aria-:ri:"
-      aria-label="Mute"
-      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+      aria-describedby="react-aria-:r2o:"
+      aria-label="Unmute"
+      class="md-button-circle-wrapper call-control-button-muted md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
       data-ghost="false"
@@ -1751,20 +2234,20 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
       type="button"
     >
       <mdc-icon
-        class="call-control-button-icon"
-        name="microphone-bold"
+        class="call-control-button-muted-icon"
+        name="microphone-muted-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:ri:"
+      id="react-aria-:r2o:"
     >
       <p>
-        Mute
+        Unmute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rj:"
+      aria-describedby="react-aria-:r2p:"
       aria-label="Hold the call"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -1785,14 +2268,14 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rj:"
+      id="react-aria-:r2p:"
     >
       <p>
         Hold the call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rk:"
+      aria-describedby="react-aria-:r2q:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Consult with another agent"
@@ -1815,14 +2298,14 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rk:"
+      id="react-aria-:r2q:"
     >
       <p>
         Consult with another agent
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rl:"
+      aria-describedby="react-aria-:r2r:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Transfer Call"
@@ -1845,14 +2328,14 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rl:"
+      id="react-aria-:r2r:"
     >
       <p>
         Transfer Call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rm:"
+      aria-describedby="react-aria-:r2s:"
       aria-label="Pause Recording"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -1873,14 +2356,14 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rm:"
+      id="react-aria-:r2s:"
     >
       <p>
         Pause Recording
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:rn:"
+      aria-describedby="react-aria-:r2t:"
       aria-label="End Call"
       class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
       data-color="primary"
@@ -1901,7 +2384,7 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:rn:"
+      id="react-aria-:r2t:"
     >
       <p>
         End Call
@@ -1911,35 +2394,7 @@ exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and vi
 </div>
 `;
 
-exports[`CallControlComponent Snapshots Rendering - Tests for UI elements and visual states of CallControl component should render with wrapup mode 1`] = `
-<div
-  class="call-control-container"
-  data-testid="call-control-container"
->
-  <div
-    class="wrapup-group"
-  >
-    <mdc-button
-      aria-expanded="false"
-      aria-haspopup="dialog"
-      color="default"
-      data-btn-type="pill-with-icon"
-      data-testid="call-control:wrapup-button"
-      id="call-control-wrapup-button"
-      postfix-icon="arrow-down-bold"
-      role="button"
-      size="28"
-      tabindex="0"
-      type="button"
-      variant="secondary"
-    >
-      Wrap up
-    </mdc-button>
-  </div>
-</div>
-`;
-
-exports[`CallControlComponent Snapshots State Management should handle combination of states: muted, held, and recording 1`] = `
+exports[`CallControlComponent Snapshots State Management should handle edge case with no buddy agents 1`] = `
 <div
   class="call-control-container"
   data-testid="call-control-container"
@@ -1948,9 +2403,9 @@ exports[`CallControlComponent Snapshots State Management should handle combinati
     class="button-group"
   >
     <button
-      aria-describedby="react-aria-:r2e:"
-      aria-label="Unmute"
-      class="md-button-circle-wrapper call-control-button-muted md-button-simple-wrapper"
+      aria-describedby="react-aria-:r2u:"
+      aria-label="Mute"
+      class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
       data-ghost="false"
@@ -1963,21 +2418,21 @@ exports[`CallControlComponent Snapshots State Management should handle combinati
       type="button"
     >
       <mdc-icon
-        class="call-control-button-muted-icon"
-        name="microphone-muted-bold"
+        class="call-control-button-icon"
+        name="microphone-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2e:"
+      id="react-aria-:r2u:"
     >
       <p>
-        Unmute
+        Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2f:"
-      aria-label="Resume the call"
+      aria-describedby="react-aria-:r2v:"
+      aria-label="Hold the call"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -1992,19 +2447,19 @@ exports[`CallControlComponent Snapshots State Management should handle combinati
     >
       <mdc-icon
         class="call-control-button-icon"
-        name="play-bold"
+        name="pause-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2f:"
+      id="react-aria-:r2v:"
     >
       <p>
-        Resume the call
+        Hold the call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2g:"
+      aria-describedby="react-aria-:r30:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Consult with another agent"
@@ -2027,14 +2482,14 @@ exports[`CallControlComponent Snapshots State Management should handle combinati
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2g:"
+      id="react-aria-:r30:"
     >
       <p>
         Consult with another agent
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2h:"
+      aria-describedby="react-aria-:r31:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Transfer Call"
@@ -2057,15 +2512,15 @@ exports[`CallControlComponent Snapshots State Management should handle combinati
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2h:"
+      id="react-aria-:r31:"
     >
       <p>
         Transfer Call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2i:"
-      aria-label="Pause Recording"
+      aria-describedby="react-aria-:r32:"
+      aria-label="Resume Recording"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -2080,23 +2535,23 @@ exports[`CallControlComponent Snapshots State Management should handle combinati
     >
       <mdc-icon
         class="call-control-button-icon"
-        name="record-paused-bold"
+        name="record-bold"
       />
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2i:"
+      id="react-aria-:r32:"
     >
       <p>
-        Pause Recording
+        Resume Recording
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2j:"
+      aria-describedby="react-aria-:r33:"
       aria-label="End Call"
-      class="md-button-circle-wrapper call-control-button-cancel call-control-button-cancel-disabled md-button-simple-wrapper"
+      class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
       data-color="primary"
-      data-disabled="true"
+      data-disabled="false"
       data-ghost="false"
       data-inverted="false"
       data-multiple-children="false"
@@ -2104,7 +2559,6 @@ exports[`CallControlComponent Snapshots State Management should handle combinati
       data-shallow-disabled="false"
       data-size="40"
       data-testid="call-control:end-call"
-      disabled=""
       type="button"
     >
       <mdc-icon
@@ -2114,7 +2568,7 @@ exports[`CallControlComponent Snapshots State Management should handle combinati
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2j:"
+      id="react-aria-:r33:"
     >
       <p>
         End Call
@@ -2124,7 +2578,7 @@ exports[`CallControlComponent Snapshots State Management should handle combinati
 </div>
 `;
 
-exports[`CallControlComponent Snapshots State Management should handle edge case with no buddy agents 1`] = `
+exports[`CallControlComponent Snapshots State Management should handle edge case with no queues 1`] = `
 <div
   class="call-control-container"
   data-testid="call-control-container"
@@ -2133,7 +2587,7 @@ exports[`CallControlComponent Snapshots State Management should handle edge case
     class="button-group"
   >
     <button
-      aria-describedby="react-aria-:r2k:"
+      aria-describedby="react-aria-:r34:"
       aria-label="Mute"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -2154,14 +2608,14 @@ exports[`CallControlComponent Snapshots State Management should handle edge case
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2k:"
+      id="react-aria-:r34:"
     >
       <p>
         Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2l:"
+      aria-describedby="react-aria-:r35:"
       aria-label="Hold the call"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -2182,14 +2636,14 @@ exports[`CallControlComponent Snapshots State Management should handle edge case
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2l:"
+      id="react-aria-:r35:"
     >
       <p>
         Hold the call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2m:"
+      aria-describedby="react-aria-:r36:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Consult with another agent"
@@ -2212,14 +2666,14 @@ exports[`CallControlComponent Snapshots State Management should handle edge case
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2m:"
+      id="react-aria-:r36:"
     >
       <p>
         Consult with another agent
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2n:"
+      aria-describedby="react-aria-:r37:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Transfer Call"
@@ -2242,14 +2696,14 @@ exports[`CallControlComponent Snapshots State Management should handle edge case
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2n:"
+      id="react-aria-:r37:"
     >
       <p>
         Transfer Call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2o:"
+      aria-describedby="react-aria-:r38:"
       aria-label="Resume Recording"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -2270,14 +2724,14 @@ exports[`CallControlComponent Snapshots State Management should handle edge case
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2o:"
+      id="react-aria-:r38:"
     >
       <p>
         Resume Recording
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2p:"
+      aria-describedby="react-aria-:r39:"
       aria-label="End Call"
       class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
       data-color="primary"
@@ -2298,7 +2752,7 @@ exports[`CallControlComponent Snapshots State Management should handle edge case
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2p:"
+      id="react-aria-:r39:"
     >
       <p>
         End Call
@@ -2308,7 +2762,7 @@ exports[`CallControlComponent Snapshots State Management should handle edge case
 </div>
 `;
 
-exports[`CallControlComponent Snapshots State Management should handle edge case with no queues 1`] = `
+exports[`CallControlComponent Snapshots State Management should handle edge case with no wrapup codes 1`] = `
 <div
   class="call-control-container"
   data-testid="call-control-container"
@@ -2317,7 +2771,7 @@ exports[`CallControlComponent Snapshots State Management should handle edge case
     class="button-group"
   >
     <button
-      aria-describedby="react-aria-:r2q:"
+      aria-describedby="react-aria-:r3a:"
       aria-label="Mute"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -2338,14 +2792,14 @@ exports[`CallControlComponent Snapshots State Management should handle edge case
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2q:"
+      id="react-aria-:r3a:"
     >
       <p>
         Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2r:"
+      aria-describedby="react-aria-:r3b:"
       aria-label="Hold the call"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -2366,14 +2820,14 @@ exports[`CallControlComponent Snapshots State Management should handle edge case
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2r:"
+      id="react-aria-:r3b:"
     >
       <p>
         Hold the call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2s:"
+      aria-describedby="react-aria-:r3c:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Consult with another agent"
@@ -2396,14 +2850,14 @@ exports[`CallControlComponent Snapshots State Management should handle edge case
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2s:"
+      id="react-aria-:r3c:"
     >
       <p>
         Consult with another agent
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2t:"
+      aria-describedby="react-aria-:r3d:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Transfer Call"
@@ -2426,14 +2880,14 @@ exports[`CallControlComponent Snapshots State Management should handle edge case
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2t:"
+      id="react-aria-:r3d:"
     >
       <p>
         Transfer Call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2u:"
+      aria-describedby="react-aria-:r3e:"
       aria-label="Resume Recording"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -2454,14 +2908,14 @@ exports[`CallControlComponent Snapshots State Management should handle edge case
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2u:"
+      id="react-aria-:r3e:"
     >
       <p>
         Resume Recording
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2v:"
+      aria-describedby="react-aria-:r3f:"
       aria-label="End Call"
       class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
       data-color="primary"
@@ -2482,7 +2936,7 @@ exports[`CallControlComponent Snapshots State Management should handle edge case
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2v:"
+      id="react-aria-:r3f:"
     >
       <p>
         End Call
@@ -2492,34 +2946,6 @@ exports[`CallControlComponent Snapshots State Management should handle edge case
 </div>
 `;
 
-exports[`CallControlComponent Snapshots State Management should handle edge case with no wrapup codes 1`] = `
-<div
-  class="call-control-container"
-  data-testid="call-control-container"
->
-  <div
-    class="wrapup-group"
-  >
-    <mdc-button
-      aria-expanded="false"
-      aria-haspopup="dialog"
-      color="default"
-      data-btn-type="pill-with-icon"
-      data-testid="call-control:wrapup-button"
-      id="call-control-wrapup-button"
-      postfix-icon="arrow-down-bold"
-      role="button"
-      size="28"
-      tabindex="0"
-      type="button"
-      variant="secondary"
-    >
-      Wrap up
-    </mdc-button>
-  </div>
-</div>
-`;
-
 exports[`CallControlComponent Snapshots State Management should update when hold state changes 1`] = `
 <div
   class="call-control-container"
@@ -2529,7 +2955,7 @@ exports[`CallControlComponent Snapshots State Management should update when hold
     class="button-group"
   >
     <button
-      aria-describedby="react-aria-:r1s:"
+      aria-describedby="react-aria-:r26:"
       aria-label="Mute"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -2550,15 +2976,15 @@ exports[`CallControlComponent Snapshots State Management should update when hold
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1s:"
+      id="react-aria-:r26:"
     >
       <p>
         Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r1t:"
-      aria-label="Resume the call"
+      aria-describedby="react-aria-:r27:"
+      aria-label="Hold the call"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
       data-disabled="false"
@@ -2578,14 +3004,14 @@ exports[`CallControlComponent Snapshots State Management should update when hold
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1t:"
+      id="react-aria-:r27:"
     >
       <p>
-        Resume the call
+        Hold the call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r1u:"
+      aria-describedby="react-aria-:r28:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Consult with another agent"
@@ -2608,14 +3034,14 @@ exports[`CallControlComponent Snapshots State Management should update when hold
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1u:"
+      id="react-aria-:r28:"
     >
       <p>
         Consult with another agent
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r1v:"
+      aria-describedby="react-aria-:r29:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Transfer Call"
@@ -2638,14 +3064,14 @@ exports[`CallControlComponent Snapshots State Management should update when hold
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r1v:"
+      id="react-aria-:r29:"
     >
       <p>
         Transfer Call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r20:"
+      aria-describedby="react-aria-:r2a:"
       aria-label="Resume Recording"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -2666,18 +3092,18 @@ exports[`CallControlComponent Snapshots State Management should update when hold
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r20:"
+      id="react-aria-:r2a:"
     >
       <p>
         Resume Recording
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r21:"
+      aria-describedby="react-aria-:r2b:"
       aria-label="End Call"
-      class="md-button-circle-wrapper call-control-button-cancel call-control-button-cancel-disabled md-button-simple-wrapper"
+      class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
       data-color="primary"
-      data-disabled="true"
+      data-disabled="false"
       data-ghost="false"
       data-inverted="false"
       data-multiple-children="false"
@@ -2685,7 +3111,6 @@ exports[`CallControlComponent Snapshots State Management should update when hold
       data-shallow-disabled="false"
       data-size="40"
       data-testid="call-control:end-call"
-      disabled=""
       type="button"
     >
       <mdc-icon
@@ -2695,7 +3120,7 @@ exports[`CallControlComponent Snapshots State Management should update when hold
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r21:"
+      id="react-aria-:r2b:"
     >
       <p>
         End Call
@@ -2714,7 +3139,7 @@ exports[`CallControlComponent Snapshots State Management should update when mute
     class="button-group"
   >
     <button
-      aria-describedby="react-aria-:r22:"
+      aria-describedby="react-aria-:r2c:"
       aria-label="Unmute"
       class="md-button-circle-wrapper call-control-button-muted md-button-simple-wrapper"
       data-color="primary"
@@ -2735,14 +3160,14 @@ exports[`CallControlComponent Snapshots State Management should update when mute
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r22:"
+      id="react-aria-:r2c:"
     >
       <p>
         Unmute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r23:"
+      aria-describedby="react-aria-:r2d:"
       aria-label="Hold the call"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -2763,14 +3188,14 @@ exports[`CallControlComponent Snapshots State Management should update when mute
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r23:"
+      id="react-aria-:r2d:"
     >
       <p>
         Hold the call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r24:"
+      aria-describedby="react-aria-:r2e:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Consult with another agent"
@@ -2793,14 +3218,14 @@ exports[`CallControlComponent Snapshots State Management should update when mute
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r24:"
+      id="react-aria-:r2e:"
     >
       <p>
         Consult with another agent
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r25:"
+      aria-describedby="react-aria-:r2f:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Transfer Call"
@@ -2823,14 +3248,14 @@ exports[`CallControlComponent Snapshots State Management should update when mute
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r25:"
+      id="react-aria-:r2f:"
     >
       <p>
         Transfer Call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r26:"
+      aria-describedby="react-aria-:r2g:"
       aria-label="Resume Recording"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -2851,14 +3276,14 @@ exports[`CallControlComponent Snapshots State Management should update when mute
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r26:"
+      id="react-aria-:r2g:"
     >
       <p>
         Resume Recording
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r27:"
+      aria-describedby="react-aria-:r2h:"
       aria-label="End Call"
       class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
       data-color="primary"
@@ -2879,7 +3304,7 @@ exports[`CallControlComponent Snapshots State Management should update when mute
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r27:"
+      id="react-aria-:r2h:"
     >
       <p>
         End Call
@@ -2898,7 +3323,7 @@ exports[`CallControlComponent Snapshots State Management should update when reco
     class="button-group"
   >
     <button
-      aria-describedby="react-aria-:r28:"
+      aria-describedby="react-aria-:r2i:"
       aria-label="Mute"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -2919,14 +3344,14 @@ exports[`CallControlComponent Snapshots State Management should update when reco
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r28:"
+      id="react-aria-:r2i:"
     >
       <p>
         Mute
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r29:"
+      aria-describedby="react-aria-:r2j:"
       aria-label="Hold the call"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -2947,14 +3372,14 @@ exports[`CallControlComponent Snapshots State Management should update when reco
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r29:"
+      id="react-aria-:r2j:"
     >
       <p>
         Hold the call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2a:"
+      aria-describedby="react-aria-:r2k:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Consult with another agent"
@@ -2977,14 +3402,14 @@ exports[`CallControlComponent Snapshots State Management should update when reco
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2a:"
+      id="react-aria-:r2k:"
     >
       <p>
         Consult with another agent
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2b:"
+      aria-describedby="react-aria-:r2l:"
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Transfer Call"
@@ -3007,14 +3432,14 @@ exports[`CallControlComponent Snapshots State Management should update when reco
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2b:"
+      id="react-aria-:r2l:"
     >
       <p>
         Transfer Call
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2c:"
+      aria-describedby="react-aria-:r2m:"
       aria-label="Pause Recording"
       class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
       data-color="primary"
@@ -3035,14 +3460,14 @@ exports[`CallControlComponent Snapshots State Management should update when reco
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2c:"
+      id="react-aria-:r2m:"
     >
       <p>
         Pause Recording
       </p>
     </div>
     <button
-      aria-describedby="react-aria-:r2d:"
+      aria-describedby="react-aria-:r2n:"
       aria-label="End Call"
       class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
       data-color="primary"
@@ -3063,7 +3488,7 @@ exports[`CallControlComponent Snapshots State Management should update when reco
     </button>
     <div
       class="md-tooltip-label"
-      id="react-aria-:r2d:"
+      id="react-aria-:r2n:"
     >
       <p>
         End Call
diff --git a/packages/contact-center/cc-components/tests/components/task/CallControl/call-control.snapshot.tsx b/packages/contact-center/cc-components/tests/components/task/CallControl/call-control.snapshot.tsx
index edd7d9a88..fdc0c9e13 100644
--- a/packages/contact-center/cc-components/tests/components/task/CallControl/call-control.snapshot.tsx
+++ b/packages/contact-center/cc-components/tests/components/task/CallControl/call-control.snapshot.tsx
@@ -3,8 +3,8 @@ import '@testing-library/jest-dom';
 import {render, fireEvent, act} from '@testing-library/react';
 import CallControlComponent from '../../../../src/components/task/CallControl/call-control';
 import {CallControlComponentProps} from '../../../../src/components/task/task.types';
-import {mockTask, mockQueueDetails, mockAgents, mockProfile, mockCC} from '@webex/test-fixtures';
-import {BuddyDetails, ContactServiceQueue, IWrapupCode} from '@webex/cc-store';
+import {mockTask, mockAgents, mockProfile, mockCC} from '@webex/test-fixtures';
+import {BuddyDetails, IWrapupCode} from '@webex/cc-store';
 
 const mockUIDProps = (container) => {
   container
@@ -70,15 +70,6 @@ describe('CallControlComponent Snapshots', () => {
     teamIds: [mockProfile.teams[0]?.teamId || 'team1'],
   })) as BuddyDetails[];
 
-  const mockQueues: ContactServiceQueue[] = mockQueueDetails.map((queue) => ({
-    id: queue.id,
-    name: queue.name,
-    description: queue.description,
-    queueType: queue.queueType,
-    checkAgentAvailability: queue.checkAgentAvailability,
-    channelType: queue.channelType,
-  })) as ContactServiceQueue[];
-
   const defaultProps: CallControlComponentProps = {
     currentTask: mockCurrentTask,
     wrapupCodes: mockWrapupCodes,
@@ -88,8 +79,6 @@ describe('CallControlComponent Snapshots', () => {
     isMuted: false,
     endCall: jest.fn(),
     wrapupCall: jest.fn(),
-    isHeld: false,
-    setIsHeld: jest.fn(),
     isRecording: false,
     setIsRecording: jest.fn(),
     buddyAgents: mockBuddyAgents,
@@ -97,43 +86,55 @@ describe('CallControlComponent Snapshots', () => {
     transferCall: jest.fn(),
     consultCall: jest.fn(),
     endConsultCall: jest.fn(),
-    consultInitiated: false,
     consultTransfer: jest.fn(),
-    consultCompleted: false,
-    consultAccepted: false,
     consultStartTimeStamp: undefined,
     callControlAudio: null,
     consultAgentName: '',
     setConsultAgentName: jest.fn(),
-    consultAgentId: '',
-    setConsultAgentId: jest.fn(),
     holdTime: 0,
     callControlClassName: '',
     callControlConsultClassName: '',
     startTimestamp: Date.now(),
-    queues: mockQueues,
-    loadQueues: jest.fn(),
-    isEndConsultEnabled: mockProfile.isEndConsultEnabled,
     allowConsultToQueue: mockProfile.allowConsultToQueue,
     lastTargetType: 'agent',
     setLastTargetType: jest.fn(),
     controlVisibility: {
-      accept: true,
-      decline: true,
-      end: true,
-      muteUnmute: true,
-      holdResume: true,
-      consult: true,
-      transfer: true,
-      conference: true,
-      wrapup: false,
-      pauseResumeRecording: true,
-      endConsult: true,
-      recordingIndicator: true,
+      accept: {isVisible: true, isEnabled: true},
+      decline: {isVisible: true, isEnabled: true},
+      end: {isVisible: true, isEnabled: true},
+      muteUnmute: {isVisible: true, isEnabled: true},
+      muteUnmuteConsult: {isVisible: true, isEnabled: true},
+      holdResume: {isVisible: true, isEnabled: true},
+      consult: {isVisible: true, isEnabled: true},
+      transfer: {isVisible: true, isEnabled: true},
+      conference: {isVisible: true, isEnabled: true},
+      wrapup: {isVisible: false, isEnabled: false},
+      pauseResumeRecording: {isVisible: true, isEnabled: true},
+      endConsult: {isVisible: true, isEnabled: true},
+      recordingIndicator: {isVisible: true, isEnabled: true},
+      exitConference: {isVisible: false, isEnabled: false},
+      mergeConference: {isVisible: false, isEnabled: false},
+      mergeConferenceConsult: {isVisible: false, isEnabled: false},
+      consultTransfer: {isVisible: false, isEnabled: false},
+      consultTransferConsult: {isVisible: false, isEnabled: false},
+      switchToMainCall: {isVisible: false, isEnabled: false},
+      switchToConsult: {isVisible: false, isEnabled: false},
+      isConferenceInProgress: false,
+      isConsultInitiated: false,
+      isConsultInitiatedAndAccepted: false,
+      isConsultInitiatedOrAccepted: false,
+      isConsultReceived: false,
+      isHeld: false,
+      consultCallHeld: false,
     },
     logger: mockLogger,
     secondsUntilAutoWrapup: undefined,
     cancelAutoWrapup: jest.fn(),
+    consultConference: jest.fn(),
+    switchToMainCall: jest.fn(),
+    switchToConsult: jest.fn(),
+    exitConference: jest.fn(),
+    conferenceParticipants: [],
   };
 
   beforeEach(() => {
@@ -216,7 +217,13 @@ describe('CallControlComponent Snapshots', () => {
     });
 
     it('should render with consultation accepted', async () => {
-      const consultAcceptedProps = {...defaultProps, consultAccepted: true};
+      const consultAcceptedProps = {
+        ...defaultProps,
+        controlVisibility: {
+          ...defaultProps.controlVisibility,
+          isConsultInitiatedOrAccepted: true,
+        },
+      };
       let screen;
       await act(async () => {
         screen = render(<CallControlComponent {...consultAcceptedProps} />);
@@ -341,7 +348,7 @@ describe('CallControlComponent Snapshots', () => {
     it('should render wrapup button in wrapup mode', async () => {
       const wrapupProps = {
         ...defaultProps,
-        controlVisibility: {...defaultProps.controlVisibility, wrapup: true},
+        controlVisibility: {...defaultProps.controlVisibility, wrapup: {isVisible: true, isEnabled: true}},
       };
       let screen;
       await act(async () => {
diff --git a/packages/contact-center/cc-components/tests/components/task/CallControl/call-control.tsx b/packages/contact-center/cc-components/tests/components/task/CallControl/call-control.tsx
index db1c9a2ae..8287d94ab 100644
--- a/packages/contact-center/cc-components/tests/components/task/CallControl/call-control.tsx
+++ b/packages/contact-center/cc-components/tests/components/task/CallControl/call-control.tsx
@@ -63,18 +63,33 @@ describe('CallControlComponent', () => {
   ];
 
   const mockControlVisibility = {
-    accept: true,
-    decline: true,
-    end: true,
-    muteUnmute: true,
-    holdResume: true,
-    consult: true,
-    transfer: true,
-    conference: true,
-    wrapup: false, // Set to false by default to show buttons
-    pauseResumeRecording: true,
-    endConsult: true,
-    recordingIndicator: true,
+    accept: {isVisible: true, isEnabled: true},
+    decline: {isVisible: true, isEnabled: true},
+    end: {isVisible: true, isEnabled: true},
+    muteUnmute: {isVisible: true, isEnabled: true},
+    muteUnmuteConsult: {isVisible: true, isEnabled: true},
+    holdResume: {isVisible: true, isEnabled: true},
+    consult: {isVisible: true, isEnabled: true},
+    transfer: {isVisible: true, isEnabled: true},
+    conference: {isVisible: true, isEnabled: true},
+    wrapup: {isVisible: false, isEnabled: false}, // Set to false by default to show buttons
+    pauseResumeRecording: {isVisible: true, isEnabled: true},
+    endConsult: {isVisible: true, isEnabled: true},
+    recordingIndicator: {isVisible: true, isEnabled: true},
+    exitConference: {isVisible: false, isEnabled: false},
+    mergeConference: {isVisible: false, isEnabled: false},
+    mergeConferenceConsult: {isVisible: false, isEnabled: false},
+    consultTransfer: {isVisible: false, isEnabled: false},
+    consultTransferConsult: {isVisible: false, isEnabled: false},
+    switchToMainCall: {isVisible: false, isEnabled: false},
+    switchToConsult: {isVisible: false, isEnabled: false},
+    isConferenceInProgress: false,
+    isConsultInitiated: false,
+    isConsultInitiatedAndAccepted: false,
+    isConsultInitiatedOrAccepted: false,
+    isConsultReceived: false,
+    isHeld: false,
+    consultCallHeld: false,
   };
 
   const defaultProps: CallControlComponentProps = {
@@ -86,32 +101,22 @@ describe('CallControlComponent', () => {
     isMuted: false,
     endCall: jest.fn(),
     wrapupCall: jest.fn(),
-    isHeld: false,
-    setIsHeld: jest.fn(),
     isRecording: false,
     setIsRecording: jest.fn(),
     buddyAgents: mockBuddyAgents,
     loadBuddyAgents: jest.fn(),
-    queues: [],
-    loadQueues: jest.fn(),
     transferCall: jest.fn(),
     consultCall: jest.fn(),
     endConsultCall: jest.fn(),
-    consultInitiated: false,
     consultTransfer: jest.fn(),
-    consultCompleted: false,
-    consultAccepted: false,
     consultStartTimeStamp: Date.now(),
     callControlAudio: null as unknown as MediaStream,
     consultAgentName: '',
     setConsultAgentName: jest.fn(),
-    consultAgentId: '',
-    setConsultAgentId: jest.fn(),
     holdTime: 0,
     callControlClassName: '',
     callControlConsultClassName: '',
     startTimestamp: Date.now(),
-    isEndConsultEnabled: true,
     allowConsultToQueue: true,
     lastTargetType: 'agent',
     setLastTargetType: jest.fn(),
@@ -119,6 +124,11 @@ describe('CallControlComponent', () => {
     logger: mockLogger,
     secondsUntilAutoWrapup: null,
     cancelAutoWrapup: jest.fn(),
+    exitConference: jest.fn(),
+    consultConference: jest.fn(),
+    switchToMainCall: jest.fn(),
+    switchToConsult: jest.fn(),
+    conferenceParticipants: [],
   };
 
   // Utility function spies
@@ -208,10 +218,10 @@ describe('CallControlComponent', () => {
       const modifiedProps = {
         ...defaultProps,
         isMuted: true,
-        isHeld: true,
         controlVisibility: {
           ...mockControlVisibility,
-          wrapup: true,
+          wrapup: {isVisible: true, isEnabled: true},
+          isHeld: true,
         },
       };
 
diff --git a/packages/contact-center/cc-components/tests/components/task/CallControl/call-control.utils.tsx b/packages/contact-center/cc-components/tests/components/task/CallControl/call-control.utils.tsx
index e121af1ac..0e8976e59 100644
--- a/packages/contact-center/cc-components/tests/components/task/CallControl/call-control.utils.tsx
+++ b/packages/contact-center/cc-components/tests/components/task/CallControl/call-control.utils.tsx
@@ -61,18 +61,33 @@ describe('CallControl Utils', () => {
   };
 
   const mockControlVisibility = {
-    accept: true,
-    decline: true,
-    end: true,
-    muteUnmute: true,
-    holdResume: true,
-    consult: true,
-    transfer: true,
-    conference: true,
-    wrapup: true,
-    pauseResumeRecording: true,
-    endConsult: true,
-    recordingIndicator: true,
+    accept: {isVisible: true, isEnabled: true},
+    decline: {isVisible: true, isEnabled: true},
+    end: {isVisible: true, isEnabled: true},
+    muteUnmute: {isVisible: true, isEnabled: true},
+    muteUnmuteConsult: {isVisible: true, isEnabled: true},
+    holdResume: {isVisible: true, isEnabled: true},
+    consult: {isVisible: true, isEnabled: true},
+    transfer: {isVisible: true, isEnabled: true},
+    conference: {isVisible: true, isEnabled: true},
+    wrapup: {isVisible: true, isEnabled: true},
+    pauseResumeRecording: {isVisible: true, isEnabled: true},
+    endConsult: {isVisible: true, isEnabled: true},
+    recordingIndicator: {isVisible: true, isEnabled: true},
+    exitConference: {isVisible: false, isEnabled: false},
+    mergeConference: {isVisible: false, isEnabled: false},
+    mergeConferenceConsult: {isVisible: false, isEnabled: false},
+    consultTransfer: {isVisible: false, isEnabled: false},
+    consultTransferConsult: {isVisible: false, isEnabled: false},
+    switchToMainCall: {isVisible: false, isEnabled: false},
+    switchToConsult: {isVisible: false, isEnabled: false},
+    isConferenceInProgress: false,
+    isConsultInitiated: false,
+    isConsultInitiatedAndAccepted: false,
+    isConsultInitiatedOrAccepted: false,
+    isConsultReceived: false,
+    isHeld: false,
+    consultCallHeld: false,
   };
 
   const mockMediaTypeInfo = {
@@ -105,30 +120,26 @@ describe('CallControl Utils', () => {
   describe('handleToggleHold', () => {
     it('should toggle hold from false to true', () => {
       const mockToggleHold = jest.fn();
-      const mockSetIsHeld = jest.fn();
 
-      handleToggleHold(false, mockToggleHold, mockSetIsHeld, loggerMock);
+      handleToggleHold(false, mockToggleHold, loggerMock);
 
       expect(loggerMock.info).toHaveBeenCalledWith('CC-Widgets: CallControl: is Call On Hold status is false', {
         module: 'call-control.tsx',
         method: 'handletoggleHold',
       });
       expect(mockToggleHold).toHaveBeenCalledWith(true);
-      expect(mockSetIsHeld).toHaveBeenCalledWith(true);
     });
 
     it('should toggle hold from true to false', () => {
       const mockToggleHold = jest.fn();
-      const mockSetIsHeld = jest.fn();
 
-      handleToggleHold(true, mockToggleHold, mockSetIsHeld, loggerMock);
+      handleToggleHold(true, mockToggleHold, loggerMock);
 
       expect(loggerMock.info).toHaveBeenCalledWith('CC-Widgets: CallControl: is Call On Hold status is true', {
         module: 'call-control.tsx',
         method: 'handletoggleHold',
       });
       expect(mockToggleHold).toHaveBeenCalledWith(false);
-      expect(mockSetIsHeld).toHaveBeenCalledWith(false);
     });
   });
 
@@ -255,14 +266,12 @@ describe('CallControl Utils', () => {
   describe('handleTargetSelect', () => {
     const mockConsultCall = jest.fn();
     const mockTransferCall = jest.fn();
-    const mockSetConsultAgentId = jest.fn();
     const mockSetConsultAgentName = jest.fn();
     const mockSetLastTargetType = jest.fn();
 
     beforeEach(() => {
       mockConsultCall.mockClear();
       mockTransferCall.mockClear();
-      mockSetConsultAgentId.mockClear();
       mockSetConsultAgentName.mockClear();
       mockSetLastTargetType.mockClear();
     });
@@ -272,10 +281,10 @@ describe('CallControl Utils', () => {
         'agent-123',
         'John Doe',
         'agent',
+        false,
         'Consult',
         mockConsultCall,
         mockTransferCall,
-        mockSetConsultAgentId,
         mockSetConsultAgentName,
         mockSetLastTargetType,
         loggerMock
@@ -285,8 +294,7 @@ describe('CallControl Utils', () => {
         module: 'call-control.tsx',
         method: 'handleTargetSelect',
       });
-      expect(mockConsultCall).toHaveBeenCalledWith('agent-123', 'agent');
-      expect(mockSetConsultAgentId).toHaveBeenCalledWith('agent-123');
+      expect(mockConsultCall).toHaveBeenCalledWith('agent-123', 'agent', false);
       expect(mockSetConsultAgentName).toHaveBeenCalledWith('John Doe');
       expect(mockSetLastTargetType).toHaveBeenCalledWith('agent');
       expect(mockTransferCall).not.toHaveBeenCalled();
@@ -297,10 +305,10 @@ describe('CallControl Utils', () => {
         'queue-456',
         'Support Queue',
         'queue',
+        false,
         'Transfer',
         mockConsultCall,
         mockTransferCall,
-        mockSetConsultAgentId,
         mockSetConsultAgentName,
         mockSetLastTargetType,
         loggerMock
@@ -312,7 +320,6 @@ describe('CallControl Utils', () => {
       });
       expect(mockTransferCall).toHaveBeenCalledWith('queue-456', 'queue');
       expect(mockConsultCall).not.toHaveBeenCalled();
-      expect(mockSetConsultAgentId).not.toHaveBeenCalled();
       expect(mockSetConsultAgentName).not.toHaveBeenCalled();
       expect(mockSetLastTargetType).not.toHaveBeenCalled();
     });
@@ -327,10 +334,10 @@ describe('CallControl Utils', () => {
           'agent-123',
           'John Doe',
           'agent',
+          false,
           'Consult',
           mockConsultCall,
           mockTransferCall,
-          mockSetConsultAgentId,
           mockSetConsultAgentName,
           mockSetLastTargetType,
           loggerMock
@@ -353,10 +360,10 @@ describe('CallControl Utils', () => {
           'queue-456',
           'Support Queue',
           'queue',
+          false,
           'Transfer',
           mockConsultCall,
           mockTransferCall,
-          mockSetConsultAgentId,
           mockSetConsultAgentName,
           mockSetLastTargetType,
           loggerMock
@@ -374,10 +381,10 @@ describe('CallControl Utils', () => {
         'agent-123',
         'John Doe',
         'agent',
+        false,
         null,
         mockConsultCall,
         mockTransferCall,
-        mockSetConsultAgentId,
         mockSetConsultAgentName,
         mockSetLastTargetType,
         loggerMock
@@ -442,12 +449,13 @@ describe('CallControl Utils', () => {
       handleToggleHoldFunc: jest.fn(),
       toggleRecording: jest.fn(),
       endCall: jest.fn(),
+      exitConference: jest.fn(),
+      switchToConsult: jest.fn(),
     };
 
     it('should build buttons with correct configuration when muted', () => {
       const buttons = buildCallControlButtons(
         true, // isMuted
-        false, // isHeld
         true, // isRecording
         false, // isMuteButtonDisabled
         mockMediaTypeInfo,
@@ -455,10 +463,14 @@ describe('CallControl Utils', () => {
         mockFunctions.handleMuteToggleFunc,
         mockFunctions.handleToggleHoldFunc,
         mockFunctions.toggleRecording,
-        mockFunctions.endCall
+        mockFunctions.endCall,
+        mockFunctions.exitConference,
+        mockFunctions.switchToConsult,
+        jest.fn(), // switchToMainCall
+        jest.fn() // mergeConference
       );
 
-      expect(buttons).toHaveLength(6);
+      expect(buttons).toHaveLength(10); // Updated to 10 to include switchToConsult, transferConsult, and conference buttons
 
       // Check mute button
       const muteButton = buttons.find((b) => b.id === 'mute');
@@ -488,17 +500,25 @@ describe('CallControl Utils', () => {
     });
 
     it('should build buttons with correct configuration when not muted and held', () => {
+      const heldControlVisibility = {
+        ...mockControlVisibility,
+        isHeld: true,
+        end: {isVisible: true, isEnabled: false}, // End button should be disabled when held
+      };
       const buttons = buildCallControlButtons(
         false, // isMuted
-        true, // isHeld
         false, // isRecording
         true, // isMuteButtonDisabled
         mockMediaTypeInfo,
-        mockControlVisibility,
+        heldControlVisibility,
         mockFunctions.handleMuteToggleFunc,
         mockFunctions.handleToggleHoldFunc,
         mockFunctions.toggleRecording,
-        mockFunctions.endCall
+        mockFunctions.endCall,
+        mockFunctions.exitConference,
+        mockFunctions.switchToConsult,
+        jest.fn(), // switchToMainCall
+        jest.fn() // mergeConference
       );
 
       // Check mute button
@@ -537,13 +557,16 @@ describe('CallControl Utils', () => {
         false,
         false,
         false,
-        false,
         mockMediaTypeInfo,
         mockControlVisibility,
         mockFunctions.handleMuteToggleFunc,
         mockFunctions.handleToggleHoldFunc,
         mockFunctions.toggleRecording,
-        mockFunctions.endCall
+        mockFunctions.endCall,
+        mockFunctions.exitConference,
+        mockFunctions.switchToConsult,
+        jest.fn(), // switchToMainCall
+        jest.fn() // mergeConference
       );
 
       const consultButton = buttons.find((b) => b.id === 'consult');
@@ -574,7 +597,6 @@ describe('CallControl Utils', () => {
     it('should build record button with correct states', () => {
       // When recording
       let buttons = buildCallControlButtons(
-        false,
         false,
         true, // isRecording
         false,
@@ -583,7 +605,11 @@ describe('CallControl Utils', () => {
         mockFunctions.handleMuteToggleFunc,
         mockFunctions.handleToggleHoldFunc,
         mockFunctions.toggleRecording,
-        mockFunctions.endCall
+        mockFunctions.endCall,
+        mockFunctions.exitConference,
+        mockFunctions.switchToConsult,
+        jest.fn(), // switchToMainCall
+        jest.fn() // mergeConference
       );
 
       let recordButton = buttons.find((b) => b.id === 'record');
@@ -592,7 +618,6 @@ describe('CallControl Utils', () => {
 
       // When not recording
       buttons = buildCallControlButtons(
-        false,
         false,
         false, // isRecording
         false,
@@ -601,13 +626,51 @@ describe('CallControl Utils', () => {
         mockFunctions.handleMuteToggleFunc,
         mockFunctions.handleToggleHoldFunc,
         mockFunctions.toggleRecording,
-        mockFunctions.endCall
+        mockFunctions.endCall,
+        mockFunctions.exitConference,
+        mockFunctions.switchToConsult,
+        jest.fn(), // switchToMainCall
+        jest.fn() // mergeConference
       );
 
       recordButton = buttons.find((b) => b.id === 'record');
       expect(recordButton?.icon).toBe('record-bold');
       expect(recordButton?.tooltip).toBe('Resume Recording');
     });
+
+    it('should build exit conference button when in conference', () => {
+      const conferenceControlVisibility = {
+        ...mockControlVisibility,
+        isConferenceInProgress: true,
+        exitConference: {isVisible: true, isEnabled: true},
+      };
+      const buttons = buildCallControlButtons(
+        false, // isMuted
+        false, // isRecording
+        false, // isMuteButtonDisabled
+        mockMediaTypeInfo,
+        conferenceControlVisibility,
+        mockFunctions.handleMuteToggleFunc,
+        mockFunctions.handleToggleHoldFunc,
+        mockFunctions.toggleRecording,
+        mockFunctions.endCall,
+        mockFunctions.exitConference,
+        mockFunctions.switchToConsult,
+        jest.fn(), // switchToMainCall
+        jest.fn() // mergeConference
+      );
+      const exitConferenceButton = buttons.find((b) => b.id === 'exitConference');
+      expect(exitConferenceButton).toEqual({
+        id: 'exitConference',
+        icon: 'exit-room-bold',
+        onClick: mockFunctions.exitConference,
+        tooltip: 'Exit Conference',
+        className: 'call-control-button-muted',
+        disabled: false,
+        isVisible: true,
+        dataTestId: 'call-control:exit-conference',
+      });
+    });
   });
 
   describe('filterButtonsForConsultation', () => {
@@ -650,42 +713,18 @@ describe('CallControl Utils', () => {
   });
 
   describe('updateCallStateFromTask', () => {
-    const mockSetIsHeld = jest.fn();
     const mockSetIsRecording = jest.fn();
 
     beforeEach(() => {
-      mockSetIsHeld.mockClear();
       mockSetIsRecording.mockClear();
     });
 
-    it('should update hold and recording state from task data', () => {
-      updateCallStateFromTask(mockCurrentTask as unknown as ITask, mockSetIsHeld, mockSetIsRecording);
+    it('should update recording state from task data', () => {
+      updateCallStateFromTask(mockCurrentTask as unknown as ITask, mockSetIsRecording);
 
-      expect(mockSetIsHeld).toHaveBeenCalledWith(false);
       expect(mockSetIsRecording).toHaveBeenCalledWith(true); // !isPaused = !false = true
     });
 
-    it('should handle task with hold state true', () => {
-      const taskWithHold = {
-        ...mockCurrentTask,
-        data: {
-          ...mockCurrentTask.data,
-          interaction: {
-            ...mockCurrentTask.data.interaction,
-            media: {
-              'media-resource-1': {
-                isHold: true,
-              },
-            },
-          },
-        },
-      };
-
-      updateCallStateFromTask(taskWithHold as unknown as ITask, mockSetIsHeld, mockSetIsRecording);
-
-      expect(mockSetIsHeld).toHaveBeenCalledWith(true);
-    });
-
     it('should handle task with recording paused', () => {
       const taskWithPausedRecording = {
         ...mockCurrentTask,
@@ -700,24 +739,22 @@ describe('CallControl Utils', () => {
         },
       };
 
-      updateCallStateFromTask(taskWithPausedRecording as unknown as ITask, mockSetIsHeld, mockSetIsRecording);
+      updateCallStateFromTask(taskWithPausedRecording as unknown as ITask, mockSetIsRecording);
 
       expect(mockSetIsRecording).toHaveBeenCalledWith(false); // !isPaused = !true = false
     });
 
     it('should return early when currentTask is null', () => {
-      updateCallStateFromTask(null as unknown as ITask, mockSetIsHeld, mockSetIsRecording);
+      updateCallStateFromTask(null as unknown as ITask, mockSetIsRecording);
 
-      expect(mockSetIsHeld).not.toHaveBeenCalled();
       expect(mockSetIsRecording).not.toHaveBeenCalled();
     });
 
     it('should return early when currentTask.data is null', () => {
       const invalidTask = {data: null};
 
-      updateCallStateFromTask(invalidTask as unknown as ITask, mockSetIsHeld, mockSetIsRecording);
+      updateCallStateFromTask(invalidTask as unknown as ITask, mockSetIsRecording);
 
-      expect(mockSetIsHeld).not.toHaveBeenCalled();
       expect(mockSetIsRecording).not.toHaveBeenCalled();
     });
 
@@ -728,29 +765,11 @@ describe('CallControl Utils', () => {
         },
       };
 
-      updateCallStateFromTask(invalidTask as unknown as ITask, mockSetIsHeld, mockSetIsRecording);
+      updateCallStateFromTask(invalidTask as unknown as ITask, mockSetIsRecording);
 
-      expect(mockSetIsHeld).not.toHaveBeenCalled();
       expect(mockSetIsRecording).not.toHaveBeenCalled();
     });
 
-    it('should handle missing media resource', () => {
-      const taskWithoutMedia = {
-        ...mockCurrentTask,
-        data: {
-          ...mockCurrentTask.data,
-          interaction: {
-            ...mockCurrentTask.data.interaction,
-            media: {},
-          },
-        },
-      };
-
-      updateCallStateFromTask(taskWithoutMedia as unknown as ITask, mockSetIsHeld, mockSetIsRecording);
-
-      expect(mockSetIsHeld).toHaveBeenCalledWith(undefined); // undefined && undefined && undefined = falsy
-    });
-
     it('should handle missing callProcessingDetails', () => {
       const taskWithoutCallProcessing = {
         ...mockCurrentTask,
@@ -763,9 +782,8 @@ describe('CallControl Utils', () => {
         },
       };
 
-      updateCallStateFromTask(taskWithoutCallProcessing as unknown as ITask, mockSetIsHeld, mockSetIsRecording);
+      updateCallStateFromTask(taskWithoutCallProcessing as unknown as ITask, mockSetIsRecording);
 
-      expect(mockSetIsHeld).toHaveBeenCalledWith(false);
       expect(mockSetIsRecording).not.toHaveBeenCalled();
     });
   });
diff --git a/packages/contact-center/cc-components/tests/components/task/CallControlCAD/__snapshots__/call-control-cad.snapshot.tsx.snap b/packages/contact-center/cc-components/tests/components/task/CallControlCAD/__snapshots__/call-control-cad.snapshot.tsx.snap
index c924a5abb..9bcd97e0d 100644
--- a/packages/contact-center/cc-components/tests/components/task/CallControlCAD/__snapshots__/call-control-cad.snapshot.tsx.snap
+++ b/packages/contact-center/cc-components/tests/components/task/CallControlCAD/__snapshots__/call-control-cad.snapshot.tsx.snap
@@ -26,18 +26,22 @@ exports[`CallControlCADComponent Snapshots should handle edge cases and control
         <div
           class="call-details"
         >
-          <mdc-text
-            class="md-text-wrapper call-timer"
-            data-testid="cc-cad:call-timer"
+          <div
+            class="call-details-row"
           >
-            Voice
-             - 
-            <span
-              data-testid="TaskTimer"
+            <mdc-text
+              class="md-text-wrapper call-timer"
+              data-testid="cc-cad:call-timer"
             >
-              00:00
-            </span>
-          </mdc-text>
+              Voice
+               - 
+              <span
+                data-testid="TaskTimer"
+              >
+                00:00
+              </span>
+            </mdc-text>
+          </div>
           <div
             class="call-status"
           />
@@ -56,7 +60,122 @@ exports[`CallControlCADComponent Snapshots should handle edge cases and control
     <div
       class="call-control-container"
       data-testid="call-control-container"
-    />
+    >
+      <div
+        class="button-group"
+      >
+        <button
+          aria-describedby="react-aria-:r1m:"
+          aria-label="Mute"
+          class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+          data-color="primary"
+          data-disabled="false"
+          data-ghost="false"
+          data-inverted="false"
+          data-multiple-children="false"
+          data-outline="false"
+          data-shallow-disabled="false"
+          data-size="40"
+          data-testid="call-control:mute-toggle"
+          type="button"
+        >
+          <mdc-icon
+            class="call-control-button-icon"
+          />
+        </button>
+        <div
+          class="md-tooltip-label"
+          id="react-aria-:r1m:"
+        >
+          <p>
+            Mute
+          </p>
+        </div>
+        <button
+          aria-describedby="react-aria-:r1n:"
+          aria-expanded="false"
+          aria-haspopup="dialog"
+          aria-label="Transfer Voice"
+          class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+          data-color="primary"
+          data-disabled="false"
+          data-ghost="false"
+          data-inverted="false"
+          data-multiple-children="false"
+          data-outline="false"
+          data-shallow-disabled="false"
+          data-size="40"
+          data-testid="call-control:transfer"
+          type="button"
+        >
+          <mdc-icon
+            class="call-control-button-icon"
+          />
+        </button>
+        <div
+          class="md-tooltip-label"
+          id="react-aria-:r1n:"
+        >
+          <p>
+            Transfer Voice
+          </p>
+        </div>
+        <button
+          aria-describedby="react-aria-:r1o:"
+          aria-label="Resume Recording"
+          class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+          data-color="primary"
+          data-disabled="false"
+          data-ghost="false"
+          data-inverted="false"
+          data-multiple-children="false"
+          data-outline="false"
+          data-shallow-disabled="false"
+          data-size="40"
+          data-testid="call-control:recording-toggle"
+          type="button"
+        >
+          <mdc-icon
+            class="call-control-button-icon"
+          />
+        </button>
+        <div
+          class="md-tooltip-label"
+          id="react-aria-:r1o:"
+        >
+          <p>
+            Resume Recording
+          </p>
+        </div>
+        <button
+          aria-describedby="react-aria-:r1p:"
+          aria-label="End Voice"
+          class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
+          data-color="primary"
+          data-disabled="false"
+          data-ghost="false"
+          data-inverted="false"
+          data-multiple-children="false"
+          data-outline="false"
+          data-shallow-disabled="false"
+          data-size="40"
+          data-testid="call-control:end-call"
+          type="button"
+        >
+          <mdc-icon
+            class="call-control-button-cancel-icon"
+          />
+        </button>
+        <div
+          class="md-tooltip-label"
+          id="react-aria-:r1p:"
+        >
+          <p>
+            End Voice
+          </p>
+        </div>
+      </div>
+    </div>
     <div
       class="cad-variables"
     >
@@ -116,7 +235,7 @@ exports[`CallControlCADComponent Snapshots should handle edge cases and control
           <mdc-text
             class="md-text-wrapper consult-sub-text"
           >
-            Consult requested
+            Consulting
              • 
             <span
               data-testid="TaskTimer"
@@ -130,7 +249,7 @@ exports[`CallControlCADComponent Snapshots should handle edge cases and control
         class="consult-buttons consult-buttons-container"
       >
         <button
-          aria-describedby="react-aria-:r19:"
+          aria-describedby="react-aria-:r1q:"
           class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
           data-color="primary"
           data-disabled="false"
@@ -149,14 +268,14 @@ exports[`CallControlCADComponent Snapshots should handle edge cases and control
         </button>
         <div
           class="md-tooltip-label"
-          id="react-aria-:r19:"
+          id="react-aria-:r1q:"
         >
           <p>
             Mute
           </p>
         </div>
         <button
-          aria-describedby="react-aria-:r1a:"
+          aria-describedby="react-aria-:r1r:"
           class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
           data-color="primary"
           data-disabled="false"
@@ -175,7 +294,7 @@ exports[`CallControlCADComponent Snapshots should handle edge cases and control
         </button>
         <div
           class="md-tooltip-label"
-          id="react-aria-:r1a:"
+          id="react-aria-:r1r:"
         >
           <p>
             End Consult
@@ -212,18 +331,22 @@ exports[`CallControlCADComponent Snapshots should handle edge cases and control
       <div
         class="call-details"
       >
-        <mdc-text
-          class="md-text-wrapper call-timer"
-          data-testid="cc-cad:call-timer"
+        <div
+          class="call-details-row"
         >
-          Voice
-           - 
-          <span
-            data-testid="TaskTimer"
+          <mdc-text
+            class="md-text-wrapper call-timer"
+            data-testid="cc-cad:call-timer"
           >
-            00:00
-          </span>
-        </mdc-text>
+            Voice
+             - 
+            <span
+              data-testid="TaskTimer"
+            >
+              00:00
+            </span>
+          </mdc-text>
+        </div>
         <div
           class="call-status"
         />
@@ -240,62 +363,7 @@ exports[`CallControlCADComponent Snapshots should handle edge cases and control
   >
     <div
       class="button-group"
-    >
-      <button
-        aria-describedby="react-aria-:r17:"
-        aria-label="Mute"
-        class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
-        data-color="primary"
-        data-disabled="false"
-        data-ghost="false"
-        data-inverted="false"
-        data-multiple-children="false"
-        data-outline="false"
-        data-shallow-disabled="false"
-        data-size="40"
-        data-testid="call-control:mute-toggle"
-        type="button"
-      >
-        <mdc-icon
-          class="call-control-button-icon"
-        />
-      </button>
-      <div
-        class="md-tooltip-label"
-        id="react-aria-:r17:"
-      >
-        <p>
-          Mute
-        </p>
-      </div>
-      <button
-        aria-describedby="react-aria-:r18:"
-        aria-label="End Voice"
-        class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
-        data-color="primary"
-        data-disabled="false"
-        data-ghost="false"
-        data-inverted="false"
-        data-multiple-children="false"
-        data-outline="false"
-        data-shallow-disabled="false"
-        data-size="40"
-        data-testid="call-control:end-call"
-        type="button"
-      >
-        <mdc-icon
-          class="call-control-button-cancel-icon"
-        />
-      </button>
-      <div
-        class="md-tooltip-label"
-        id="react-aria-:r18:"
-      >
-        <p>
-          End Voice
-        </p>
-      </div>
-    </div>
+    />
   </div>
   <div
     class="cad-variables"
@@ -362,18 +430,22 @@ exports[`CallControlCADComponent Snapshots should handle edge cases and control
       <div
         class="call-details"
       >
-        <mdc-text
-          class="md-text-wrapper call-timer"
-          data-testid="cc-cad:call-timer"
+        <div
+          class="call-details-row"
         >
-          Voice
-           - 
-          <span
-            data-testid="TaskTimer"
+          <mdc-text
+            class="md-text-wrapper call-timer"
+            data-testid="cc-cad:call-timer"
           >
-            00:00
-          </span>
-        </mdc-text>
+            Voice
+             - 
+            <span
+              data-testid="TaskTimer"
+            >
+              00:00
+            </span>
+          </mdc-text>
+        </div>
         <div
           class="call-status"
         />
@@ -397,7 +469,7 @@ exports[`CallControlCADComponent Snapshots should handle edge cases and control
       class="button-group"
     >
       <button
-        aria-describedby="react-aria-:r11:"
+        aria-describedby="react-aria-:r1g:"
         aria-label="Mute"
         class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
         data-color="primary"
@@ -417,14 +489,14 @@ exports[`CallControlCADComponent Snapshots should handle edge cases and control
       </button>
       <div
         class="md-tooltip-label"
-        id="react-aria-:r11:"
+        id="react-aria-:r1g:"
       >
         <p>
           Mute
         </p>
       </div>
       <button
-        aria-describedby="react-aria-:r12:"
+        aria-describedby="react-aria-:r1h:"
         aria-label="Hold the call"
         class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
         data-color="primary"
@@ -444,14 +516,14 @@ exports[`CallControlCADComponent Snapshots should handle edge cases and control
       </button>
       <div
         class="md-tooltip-label"
-        id="react-aria-:r12:"
+        id="react-aria-:r1h:"
       >
         <p>
           Hold the call
         </p>
       </div>
       <button
-        aria-describedby="react-aria-:r13:"
+        aria-describedby="react-aria-:r1i:"
         aria-expanded="false"
         aria-haspopup="dialog"
         aria-label="Consult with another agent"
@@ -473,14 +545,14 @@ exports[`CallControlCADComponent Snapshots should handle edge cases and control
       </button>
       <div
         class="md-tooltip-label"
-        id="react-aria-:r13:"
+        id="react-aria-:r1i:"
       >
         <p>
           Consult with another agent
         </p>
       </div>
       <button
-        aria-describedby="react-aria-:r14:"
+        aria-describedby="react-aria-:r1j:"
         aria-expanded="false"
         aria-haspopup="dialog"
         aria-label="Transfer Voice"
@@ -502,14 +574,14 @@ exports[`CallControlCADComponent Snapshots should handle edge cases and control
       </button>
       <div
         class="md-tooltip-label"
-        id="react-aria-:r14:"
+        id="react-aria-:r1j:"
       >
         <p>
           Transfer Voice
         </p>
       </div>
       <button
-        aria-describedby="react-aria-:r15:"
+        aria-describedby="react-aria-:r1k:"
         aria-label="Resume Recording"
         class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
         data-color="primary"
@@ -529,14 +601,14 @@ exports[`CallControlCADComponent Snapshots should handle edge cases and control
       </button>
       <div
         class="md-tooltip-label"
-        id="react-aria-:r15:"
+        id="react-aria-:r1k:"
       >
         <p>
           Resume Recording
         </p>
       </div>
       <button
-        aria-describedby="react-aria-:r16:"
+        aria-describedby="react-aria-:r1l:"
         aria-label="End Voice"
         class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
         data-color="primary"
@@ -556,7 +628,7 @@ exports[`CallControlCADComponent Snapshots should handle edge cases and control
       </button>
       <div
         class="md-tooltip-label"
-        id="react-aria-:r16:"
+        id="react-aria-:r1l:"
       >
         <p>
           End Voice
@@ -640,18 +712,22 @@ exports[`CallControlCADComponent Snapshots should render basic call states and m
       <div
         class="call-details"
       >
-        <mdc-text
-          class="md-text-wrapper call-timer"
-          data-testid="cc-cad:call-timer"
+        <div
+          class="call-details-row"
         >
-          Chat
-           - 
-          <span
-            data-testid="TaskTimer"
+          <mdc-text
+            class="md-text-wrapper call-timer"
+            data-testid="cc-cad:call-timer"
           >
-            00:00
-          </span>
-        </mdc-text>
+            Chat
+             - 
+            <span
+              data-testid="TaskTimer"
+            >
+              00:00
+            </span>
+          </mdc-text>
+        </div>
         <div
           class="call-status"
         />
@@ -918,41 +994,25 @@ exports[`CallControlCADComponent Snapshots should render basic call states and m
       <div
         class="call-details"
       >
-        <mdc-text
-          class="md-text-wrapper call-timer"
-          data-testid="cc-cad:call-timer"
-        >
-          Voice
-           - 
-          <span
-            data-testid="TaskTimer"
-          >
-            00:00
-          </span>
-        </mdc-text>
         <div
-          class="call-status"
+          class="call-details-row"
         >
-          <span
-            class="dot"
-          >
-            •
-          </span>
-          <div
-            class="on-hold"
+          <mdc-text
+            class="md-text-wrapper call-timer"
+            data-testid="cc-cad:call-timer"
           >
-            <mdc-icon
-              class="call-hold-filled-icon"
-            />
+            Voice
+             - 
             <span
-              class="on-hold-chip-text"
+              data-testid="TaskTimer"
             >
-              On hold -
-               
-              02:05
+              00:00
             </span>
-          </div>
+          </mdc-text>
         </div>
+        <div
+          class="call-status"
+        />
       </div>
     </div>
   </div>
@@ -1001,7 +1061,7 @@ exports[`CallControlCADComponent Snapshots should render basic call states and m
       </div>
       <button
         aria-describedby="react-aria-:r7:"
-        aria-label="Resume the call"
+        aria-label="Hold the call"
         class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
         data-color="primary"
         data-disabled="false"
@@ -1023,7 +1083,7 @@ exports[`CallControlCADComponent Snapshots should render basic call states and m
         id="react-aria-:r7:"
       >
         <p>
-          Resume the call
+          Hold the call
         </p>
       </div>
       <button
@@ -1114,9 +1174,9 @@ exports[`CallControlCADComponent Snapshots should render basic call states and m
       <button
         aria-describedby="react-aria-:rb:"
         aria-label="End Voice"
-        class="md-button-circle-wrapper call-control-button-cancel call-control-button-cancel-disabled md-button-simple-wrapper"
+        class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
         data-color="primary"
-        data-disabled="true"
+        data-disabled="false"
         data-ghost="false"
         data-inverted="false"
         data-multiple-children="false"
@@ -1124,7 +1184,6 @@ exports[`CallControlCADComponent Snapshots should render basic call states and m
         data-shallow-disabled="false"
         data-size="40"
         data-testid="call-control:end-call"
-        disabled=""
         type="button"
       >
         <mdc-icon
@@ -1206,18 +1265,22 @@ exports[`CallControlCADComponent Snapshots should render basic call states and m
       <div
         class="call-details"
       >
-        <mdc-text
-          class="md-text-wrapper call-timer"
-          data-testid="cc-cad:call-timer"
+        <div
+          class="call-details-row"
         >
-          Voice
-           - 
-          <span
-            data-testid="TaskTimer"
+          <mdc-text
+            class="md-text-wrapper call-timer"
+            data-testid="cc-cad:call-timer"
           >
-            00:00
-          </span>
-        </mdc-text>
+            Voice
+             - 
+            <span
+              data-testid="TaskTimer"
+            >
+              00:00
+            </span>
+          </mdc-text>
+        </div>
         <div
           class="call-status"
         />
@@ -1484,18 +1547,22 @@ exports[`CallControlCADComponent Snapshots should render basic call states and m
       <div
         class="call-details"
       >
-        <mdc-text
-          class="md-text-wrapper call-timer"
-          data-testid="cc-cad:call-timer"
+        <div
+          class="call-details-row"
         >
-          Social
-           - 
-          <span
-            data-testid="TaskTimer"
+          <mdc-text
+            class="md-text-wrapper call-timer"
+            data-testid="cc-cad:call-timer"
           >
-            00:00
-          </span>
-        </mdc-text>
+            Social
+             - 
+            <span
+              data-testid="TaskTimer"
+            >
+              00:00
+            </span>
+          </mdc-text>
+        </div>
         <div
           class="call-status"
         />
@@ -1763,18 +1830,22 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
         <div
           class="call-details"
         >
-          <mdc-text
-            class="md-text-wrapper call-timer"
-            data-testid="cc-cad:call-timer"
+          <div
+            class="call-details-row"
           >
-            Voice
-             - 
-            <span
-              data-testid="TaskTimer"
+            <mdc-text
+              class="md-text-wrapper call-timer"
+              data-testid="cc-cad:call-timer"
             >
-              00:00
-            </span>
-          </mdc-text>
+              Voice
+               - 
+              <span
+                data-testid="TaskTimer"
+              >
+                00:00
+              </span>
+            </mdc-text>
+          </div>
           <div
             class="call-status"
           />
@@ -1793,7 +1864,122 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
     <div
       class="call-control-container"
       data-testid="call-control-container"
-    />
+    >
+      <div
+        class="button-group"
+      >
+        <button
+          aria-describedby="react-aria-:ru:"
+          aria-label="Mute"
+          class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+          data-color="primary"
+          data-disabled="false"
+          data-ghost="false"
+          data-inverted="false"
+          data-multiple-children="false"
+          data-outline="false"
+          data-shallow-disabled="false"
+          data-size="40"
+          data-testid="call-control:mute-toggle"
+          type="button"
+        >
+          <mdc-icon
+            class="call-control-button-icon"
+          />
+        </button>
+        <div
+          class="md-tooltip-label"
+          id="react-aria-:ru:"
+        >
+          <p>
+            Mute
+          </p>
+        </div>
+        <button
+          aria-describedby="react-aria-:rv:"
+          aria-expanded="false"
+          aria-haspopup="dialog"
+          aria-label="Transfer Voice"
+          class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+          data-color="primary"
+          data-disabled="false"
+          data-ghost="false"
+          data-inverted="false"
+          data-multiple-children="false"
+          data-outline="false"
+          data-shallow-disabled="false"
+          data-size="40"
+          data-testid="call-control:transfer"
+          type="button"
+        >
+          <mdc-icon
+            class="call-control-button-icon"
+          />
+        </button>
+        <div
+          class="md-tooltip-label"
+          id="react-aria-:rv:"
+        >
+          <p>
+            Transfer Voice
+          </p>
+        </div>
+        <button
+          aria-describedby="react-aria-:r10:"
+          aria-label="Resume Recording"
+          class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+          data-color="primary"
+          data-disabled="false"
+          data-ghost="false"
+          data-inverted="false"
+          data-multiple-children="false"
+          data-outline="false"
+          data-shallow-disabled="false"
+          data-size="40"
+          data-testid="call-control:recording-toggle"
+          type="button"
+        >
+          <mdc-icon
+            class="call-control-button-icon"
+          />
+        </button>
+        <div
+          class="md-tooltip-label"
+          id="react-aria-:r10:"
+        >
+          <p>
+            Resume Recording
+          </p>
+        </div>
+        <button
+          aria-describedby="react-aria-:r11:"
+          aria-label="End Voice"
+          class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
+          data-color="primary"
+          data-disabled="false"
+          data-ghost="false"
+          data-inverted="false"
+          data-multiple-children="false"
+          data-outline="false"
+          data-shallow-disabled="false"
+          data-size="40"
+          data-testid="call-control:end-call"
+          type="button"
+        >
+          <mdc-icon
+            class="call-control-button-cancel-icon"
+          />
+        </button>
+        <div
+          class="md-tooltip-label"
+          id="react-aria-:r11:"
+        >
+          <p>
+            End Voice
+          </p>
+        </div>
+      </div>
+    </div>
     <div
       class="cad-variables"
     >
@@ -1853,7 +2039,7 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
           <mdc-text
             class="md-text-wrapper consult-sub-text"
           >
-            Consult requested
+            Consulting
              • 
             <span
               data-testid="TaskTimer"
@@ -1867,7 +2053,7 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
         class="consult-buttons consult-buttons-container"
       >
         <button
-          aria-describedby="react-aria-:rv:"
+          aria-describedby="react-aria-:r12:"
           class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
           data-color="primary"
           data-disabled="false"
@@ -1886,14 +2072,14 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
         </button>
         <div
           class="md-tooltip-label"
-          id="react-aria-:rv:"
+          id="react-aria-:r12:"
         >
           <p>
             Mute
           </p>
         </div>
         <button
-          aria-describedby="react-aria-:r10:"
+          aria-describedby="react-aria-:r13:"
           class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
           data-color="primary"
           data-disabled="false"
@@ -1912,7 +2098,7 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
         </button>
         <div
           class="md-tooltip-label"
-          id="react-aria-:r10:"
+          id="react-aria-:r13:"
         >
           <p>
             End Consult
@@ -1949,24 +2135,33 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
       <div
         class="call-details"
       >
-        <mdc-text
-          class="md-text-wrapper call-timer"
-          data-testid="cc-cad:call-timer"
+        <div
+          class="call-details-row"
         >
-          Voice
-           - 
-          <span
-            data-testid="TaskTimer"
+          <mdc-text
+            class="md-text-wrapper call-timer"
+            data-testid="cc-cad:call-timer"
           >
-            00:00
-          </span>
-        </mdc-text>
+            Voice
+             - 
+            <span
+              data-testid="TaskTimer"
+            >
+              00:00
+            </span>
+          </mdc-text>
+        </div>
         <div
           class="call-status"
         />
       </div>
     </div>
   </div>
+  <div
+    class="recording-indicator"
+  >
+    <mdc-icon />
+  </div>
   <audio
     autoplay=""
     id="remote-audio"
@@ -1976,97 +2171,202 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
     data-testid="call-control-container"
   >
     <div
-      class="wrapup-group"
-    >
-      <mdc-button
-        aria-expanded="false"
-        aria-haspopup="dialog"
-        data-testid="call-control:wrapup-button"
-        id="call-control-wrapup-button"
-        postfix-icon="arrow-down-bold"
-      >
-        Wrap up
-      </mdc-button>
-    </div>
-  </div>
-  <div
-    class="cad-variables"
-  >
-    <mdc-text
-      class="md-text-wrapper queue"
-    >
-      <strong>
-        Queue:
-      </strong>
-       
-      <span>
-        Support Team
-      </span>
-    </mdc-text>
-    <mdc-text
-      class="md-text-wrapper voice-phone-number"
-    >
-      <strong>
-        Phone Number:
-      </strong>
-       
-      <span>
-        555-123-4567
-      </span>
-    </mdc-text>
-    <mdc-text
-      class="md-text-wrapper rona"
-    >
-      <strong>
-        RONA:
-      </strong>
-       
-      <span>
-        30
-      </span>
-    </mdc-text>
-  </div>
-</div>
-`;
-
-exports[`CallControlCADComponent Snapshots should render consultation and wrapup modes: consultation-initiated 1`] = `
-<div>
-  <div
-    class="call-control-container "
-  >
-    <div
-      class="caller-info"
+      class="button-group"
     >
-      <div
-        class="call-icon-background"
+      <button
+        aria-describedby="react-aria-:r1a:"
+        aria-label="Mute"
+        class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+        data-color="primary"
+        data-disabled="false"
+        data-ghost="false"
+        data-inverted="false"
+        data-multiple-children="false"
+        data-outline="false"
+        data-shallow-disabled="false"
+        data-size="40"
+        data-testid="call-control:mute-toggle"
+        type="button"
       >
         <mdc-icon
-          class="media-icon voice-media"
+          class="call-control-button-icon"
         />
-      </div>
+      </button>
       <div
-        class="customer-info"
+        class="md-tooltip-label"
+        id="react-aria-:r1a:"
       >
-        <mdc-text
-          class="md-text-wrapper voice-customer-name"
-        >
-          555-123-4567
-        </mdc-text>
-        <div
-          class="call-details"
-        >
-          <mdc-text
-            class="md-text-wrapper call-timer"
-            data-testid="cc-cad:call-timer"
+        <p>
+          Mute
+        </p>
+      </div>
+      <button
+        aria-describedby="react-aria-:r1b:"
+        aria-expanded="false"
+        aria-haspopup="dialog"
+        aria-label="Transfer Voice"
+        class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+        data-color="primary"
+        data-disabled="false"
+        data-ghost="false"
+        data-inverted="false"
+        data-multiple-children="false"
+        data-outline="false"
+        data-shallow-disabled="false"
+        data-size="40"
+        data-testid="call-control:transfer"
+        type="button"
+      >
+        <mdc-icon
+          class="call-control-button-icon"
+        />
+      </button>
+      <div
+        class="md-tooltip-label"
+        id="react-aria-:r1b:"
+      >
+        <p>
+          Transfer Voice
+        </p>
+      </div>
+      <button
+        aria-describedby="react-aria-:r1c:"
+        aria-label="Resume Recording"
+        class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+        data-color="primary"
+        data-disabled="false"
+        data-ghost="false"
+        data-inverted="false"
+        data-multiple-children="false"
+        data-outline="false"
+        data-shallow-disabled="false"
+        data-size="40"
+        data-testid="call-control:recording-toggle"
+        type="button"
+      >
+        <mdc-icon
+          class="call-control-button-icon"
+        />
+      </button>
+      <div
+        class="md-tooltip-label"
+        id="react-aria-:r1c:"
+      >
+        <p>
+          Resume Recording
+        </p>
+      </div>
+      <button
+        aria-describedby="react-aria-:r1d:"
+        aria-label="End Voice"
+        class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
+        data-color="primary"
+        data-disabled="false"
+        data-ghost="false"
+        data-inverted="false"
+        data-multiple-children="false"
+        data-outline="false"
+        data-shallow-disabled="false"
+        data-size="40"
+        data-testid="call-control:end-call"
+        type="button"
+      >
+        <mdc-icon
+          class="call-control-button-cancel-icon"
+        />
+      </button>
+      <div
+        class="md-tooltip-label"
+        id="react-aria-:r1d:"
+      >
+        <p>
+          End Voice
+        </p>
+      </div>
+    </div>
+  </div>
+  <div
+    class="cad-variables"
+  >
+    <mdc-text
+      class="md-text-wrapper queue"
+    >
+      <strong>
+        Queue:
+      </strong>
+       
+      <span>
+        Support Team
+      </span>
+    </mdc-text>
+    <mdc-text
+      class="md-text-wrapper voice-phone-number"
+    >
+      <strong>
+        Phone Number:
+      </strong>
+       
+      <span>
+        555-123-4567
+      </span>
+    </mdc-text>
+    <mdc-text
+      class="md-text-wrapper rona"
+    >
+      <strong>
+        RONA:
+      </strong>
+       
+      <span>
+        30
+      </span>
+    </mdc-text>
+  </div>
+</div>
+`;
+
+exports[`CallControlCADComponent Snapshots should render consultation and wrapup modes: consultation-initiated 1`] = `
+<div>
+  <div
+    class="call-control-container "
+  >
+    <div
+      class="caller-info"
+    >
+      <div
+        class="call-icon-background"
+      >
+        <mdc-icon
+          class="media-icon voice-media"
+        />
+      </div>
+      <div
+        class="customer-info"
+      >
+        <mdc-text
+          class="md-text-wrapper voice-customer-name"
+        >
+          555-123-4567
+        </mdc-text>
+        <div
+          class="call-details"
+        >
+          <div
+            class="call-details-row"
           >
-            Voice
-             - 
-            <span
-              data-testid="TaskTimer"
+            <mdc-text
+              class="md-text-wrapper call-timer"
+              data-testid="cc-cad:call-timer"
             >
-              00:00
-            </span>
-          </mdc-text>
+              Voice
+               - 
+              <span
+                data-testid="TaskTimer"
+              >
+                00:00
+              </span>
+            </mdc-text>
+          </div>
           <div
             class="call-status"
           />
@@ -2092,9 +2392,9 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
         <button
           aria-describedby="react-aria-:ro:"
           aria-label="Mute"
-          class="md-button-circle-wrapper call-control-button call-control-button-disabled md-button-simple-wrapper"
+          class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
           data-color="primary"
-          data-disabled="true"
+          data-disabled="false"
           data-ghost="false"
           data-inverted="false"
           data-multiple-children="false"
@@ -2102,7 +2402,6 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
           data-shallow-disabled="false"
           data-size="40"
           data-testid="call-control:mute-toggle"
-          disabled=""
           type="button"
         >
           <mdc-icon
@@ -2119,12 +2418,68 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
         </div>
         <button
           aria-describedby="react-aria-:rp:"
+          aria-label="Hold the call"
+          class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+          data-color="primary"
+          data-disabled="false"
+          data-ghost="false"
+          data-inverted="false"
+          data-multiple-children="false"
+          data-outline="false"
+          data-shallow-disabled="false"
+          data-size="40"
+          data-testid="call-control:hold-toggle"
+          type="button"
+        >
+          <mdc-icon
+            class="call-control-button-icon"
+          />
+        </button>
+        <div
+          class="md-tooltip-label"
+          id="react-aria-:rp:"
+        >
+          <p>
+            Hold the call
+          </p>
+        </div>
+        <button
+          aria-describedby="react-aria-:rq:"
+          aria-expanded="false"
+          aria-haspopup="dialog"
+          aria-label="Consult with another agent"
+          class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+          data-color="primary"
+          data-disabled="false"
+          data-ghost="false"
+          data-inverted="false"
+          data-multiple-children="false"
+          data-outline="false"
+          data-shallow-disabled="false"
+          data-size="40"
+          data-testid="call-control:consult"
+          type="button"
+        >
+          <mdc-icon
+            class="call-control-button-icon"
+          />
+        </button>
+        <div
+          class="md-tooltip-label"
+          id="react-aria-:rq:"
+        >
+          <p>
+            Consult with another agent
+          </p>
+        </div>
+        <button
+          aria-describedby="react-aria-:rr:"
           aria-expanded="false"
           aria-haspopup="dialog"
           aria-label="Transfer Voice"
           class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
           data-color="primary"
-          data-disabled="true"
+          data-disabled="false"
           data-ghost="false"
           data-inverted="false"
           data-multiple-children="false"
@@ -2132,7 +2487,6 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
           data-shallow-disabled="false"
           data-size="40"
           data-testid="call-control:transfer"
-          disabled=""
           type="button"
         >
           <mdc-icon
@@ -2141,18 +2495,18 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
         </button>
         <div
           class="md-tooltip-label"
-          id="react-aria-:rp:"
+          id="react-aria-:rr:"
         >
           <p>
             Transfer Voice
           </p>
         </div>
         <button
-          aria-describedby="react-aria-:rq:"
+          aria-describedby="react-aria-:rs:"
           aria-label="Resume Recording"
-          class="md-button-circle-wrapper call-control-button call-control-button-disabled md-button-simple-wrapper"
+          class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
           data-color="primary"
-          data-disabled="true"
+          data-disabled="false"
           data-ghost="false"
           data-inverted="false"
           data-multiple-children="false"
@@ -2160,7 +2514,6 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
           data-shallow-disabled="false"
           data-size="40"
           data-testid="call-control:recording-toggle"
-          disabled=""
           type="button"
         >
           <mdc-icon
@@ -2169,18 +2522,18 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
         </button>
         <div
           class="md-tooltip-label"
-          id="react-aria-:rq:"
+          id="react-aria-:rs:"
         >
           <p>
             Resume Recording
           </p>
         </div>
         <button
-          aria-describedby="react-aria-:rr:"
+          aria-describedby="react-aria-:rt:"
           aria-label="End Voice"
-          class="md-button-circle-wrapper call-control-button-cancel call-control-button-cancel-disabled md-button-simple-wrapper"
+          class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
           data-color="primary"
-          data-disabled="true"
+          data-disabled="false"
           data-ghost="false"
           data-inverted="false"
           data-multiple-children="false"
@@ -2188,7 +2541,6 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
           data-shallow-disabled="false"
           data-size="40"
           data-testid="call-control:end-call"
-          disabled=""
           type="button"
         >
           <mdc-icon
@@ -2197,7 +2549,7 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
         </button>
         <div
           class="md-tooltip-label"
-          id="react-aria-:rr:"
+          id="react-aria-:rt:"
         >
           <p>
             End Voice
@@ -2243,29 +2595,43 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
       </mdc-text>
     </div>
   </div>
+</div>
+`;
+
+exports[`CallControlCADComponent Snapshots should render consultation and wrapup modes: wrapup-mode 1`] = `
+<div
+  class="call-control-container "
+>
   <div
-    class="call-control-consult-container "
+    class="caller-info"
   >
     <div
-      class="call-control-consult"
+      class="call-icon-background"
+    >
+      <mdc-icon
+        class="media-icon voice-media"
+      />
+    </div>
+    <div
+      class="customer-info"
     >
+      <mdc-text
+        class="md-text-wrapper voice-customer-name"
+      >
+        555-123-4567
+      </mdc-text>
       <div
-        class="consult-header"
+        class="call-details"
       >
-        <mdc-avatar
-          class="task-avatar"
-        />
-        <div>
-          <mdc-text
-            class="md-text-wrapper consult-agent-name"
-          >
-            Consult Agent
-          </mdc-text>
+        <div
+          class="call-details-row"
+        >
           <mdc-text
-            class="md-text-wrapper consult-sub-text"
+            class="md-text-wrapper call-timer"
+            data-testid="cc-cad:call-timer"
           >
-            Consult requested
-             • 
+            Voice
+             - 
             <span
               data-testid="TaskTimer"
             >
@@ -2273,137 +2639,16 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
             </span>
           </mdc-text>
         </div>
-      </div>
-      <div
-        class="consult-buttons consult-buttons-container"
-      >
-        <button
-          aria-describedby="react-aria-:rs:"
-          class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
-          data-color="primary"
-          data-disabled="false"
-          data-ghost="false"
-          data-inverted="false"
-          data-multiple-children="false"
-          data-outline="false"
-          data-shallow-disabled="false"
-          data-size="40"
-          data-testid="mute-consult-btn"
-          type="button"
-        >
-          <mdc-icon
-            class="call-control-button-icon"
-          />
-        </button>
-        <div
-          class="md-tooltip-label"
-          id="react-aria-:rs:"
-        >
-          <p>
-            Mute
-          </p>
-        </div>
-        <button
-          aria-describedby="react-aria-:rt:"
-          class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
-          data-color="primary"
-          data-disabled="true"
-          data-ghost="false"
-          data-inverted="false"
-          data-multiple-children="false"
-          data-outline="false"
-          data-shallow-disabled="false"
-          data-size="40"
-          data-testid="transfer-consult-btn"
-          disabled=""
-          type="button"
-        >
-          <mdc-icon
-            class="call-control-button-icon"
-          />
-        </button>
-        <div
-          class="md-tooltip-label"
-          id="react-aria-:rt:"
-        >
-          <p>
-            Transfer Consult
-          </p>
-        </div>
-        <button
-          aria-describedby="react-aria-:ru:"
-          class="md-button-circle-wrapper call-control-consult-button-cancel md-button-simple-wrapper"
-          data-color="primary"
-          data-disabled="false"
-          data-ghost="false"
-          data-inverted="false"
-          data-multiple-children="false"
-          data-outline="false"
-          data-shallow-disabled="false"
-          data-size="40"
-          data-testid="cancel-consult-btn"
-          type="button"
-        >
-          <mdc-icon
-            class="call-control-consult-button-cancel-icon"
-          />
-        </button>
         <div
-          class="md-tooltip-label"
-          id="react-aria-:ru:"
-        >
-          <p>
-            End Consult
-          </p>
-        </div>
+          class="call-status"
+        />
       </div>
     </div>
   </div>
-</div>
-`;
-
-exports[`CallControlCADComponent Snapshots should render consultation and wrapup modes: wrapup-mode 1`] = `
-<div
-  class="call-control-container "
->
   <div
-    class="caller-info"
+    class="recording-indicator"
   >
-    <div
-      class="call-icon-background"
-    >
-      <mdc-icon
-        class="media-icon voice-media"
-      />
-    </div>
-    <div
-      class="customer-info"
-    >
-      <mdc-text
-        class="md-text-wrapper voice-customer-name"
-      >
-        555-123-4567
-      </mdc-text>
-      <div
-        class="call-details"
-      >
-        <mdc-text
-          class="md-text-wrapper call-timer"
-          data-testid="cc-cad:call-timer"
-        >
-          Voice
-           - 
-          <span
-            data-testid="TaskTimer"
-          >
-            00:00
-          </span>
-        </mdc-text>
-        <div
-          class="call-status"
-        />
-      </div>
-    </div>
+    <mdc-icon />
   </div>
   <audio
     autoplay=""
@@ -2414,17 +2659,174 @@ exports[`CallControlCADComponent Snapshots should render consultation and wrapup
     data-testid="call-control-container"
   >
     <div
-      class="wrapup-group"
+      class="button-group"
     >
-      <mdc-button
+      <button
+        aria-describedby="react-aria-:r14:"
+        aria-label="Mute"
+        class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+        data-color="primary"
+        data-disabled="false"
+        data-ghost="false"
+        data-inverted="false"
+        data-multiple-children="false"
+        data-outline="false"
+        data-shallow-disabled="false"
+        data-size="40"
+        data-testid="call-control:mute-toggle"
+        type="button"
+      >
+        <mdc-icon
+          class="call-control-button-icon"
+        />
+      </button>
+      <div
+        class="md-tooltip-label"
+        id="react-aria-:r14:"
+      >
+        <p>
+          Mute
+        </p>
+      </div>
+      <button
+        aria-describedby="react-aria-:r15:"
+        aria-label="Hold the call"
+        class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+        data-color="primary"
+        data-disabled="false"
+        data-ghost="false"
+        data-inverted="false"
+        data-multiple-children="false"
+        data-outline="false"
+        data-shallow-disabled="false"
+        data-size="40"
+        data-testid="call-control:hold-toggle"
+        type="button"
+      >
+        <mdc-icon
+          class="call-control-button-icon"
+        />
+      </button>
+      <div
+        class="md-tooltip-label"
+        id="react-aria-:r15:"
+      >
+        <p>
+          Hold the call
+        </p>
+      </div>
+      <button
+        aria-describedby="react-aria-:r16:"
+        aria-expanded="false"
+        aria-haspopup="dialog"
+        aria-label="Consult with another agent"
+        class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+        data-color="primary"
+        data-disabled="false"
+        data-ghost="false"
+        data-inverted="false"
+        data-multiple-children="false"
+        data-outline="false"
+        data-shallow-disabled="false"
+        data-size="40"
+        data-testid="call-control:consult"
+        type="button"
+      >
+        <mdc-icon
+          class="call-control-button-icon"
+        />
+      </button>
+      <div
+        class="md-tooltip-label"
+        id="react-aria-:r16:"
+      >
+        <p>
+          Consult with another agent
+        </p>
+      </div>
+      <button
+        aria-describedby="react-aria-:r17:"
         aria-expanded="false"
         aria-haspopup="dialog"
-        data-testid="call-control:wrapup-button"
-        id="call-control-wrapup-button"
-        postfix-icon="arrow-down-bold"
+        aria-label="Transfer Voice"
+        class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+        data-color="primary"
+        data-disabled="false"
+        data-ghost="false"
+        data-inverted="false"
+        data-multiple-children="false"
+        data-outline="false"
+        data-shallow-disabled="false"
+        data-size="40"
+        data-testid="call-control:transfer"
+        type="button"
       >
-        Wrap up
-      </mdc-button>
+        <mdc-icon
+          class="call-control-button-icon"
+        />
+      </button>
+      <div
+        class="md-tooltip-label"
+        id="react-aria-:r17:"
+      >
+        <p>
+          Transfer Voice
+        </p>
+      </div>
+      <button
+        aria-describedby="react-aria-:r18:"
+        aria-label="Resume Recording"
+        class="md-button-circle-wrapper call-control-button md-button-simple-wrapper"
+        data-color="primary"
+        data-disabled="false"
+        data-ghost="false"
+        data-inverted="false"
+        data-multiple-children="false"
+        data-outline="false"
+        data-shallow-disabled="false"
+        data-size="40"
+        data-testid="call-control:recording-toggle"
+        type="button"
+      >
+        <mdc-icon
+          class="call-control-button-icon"
+        />
+      </button>
+      <div
+        class="md-tooltip-label"
+        id="react-aria-:r18:"
+      >
+        <p>
+          Resume Recording
+        </p>
+      </div>
+      <button
+        aria-describedby="react-aria-:r19:"
+        aria-label="End Voice"
+        class="md-button-circle-wrapper call-control-button-cancel md-button-simple-wrapper"
+        data-color="primary"
+        data-disabled="false"
+        data-ghost="false"
+        data-inverted="false"
+        data-multiple-children="false"
+        data-outline="false"
+        data-shallow-disabled="false"
+        data-size="40"
+        data-testid="call-control:end-call"
+        type="button"
+      >
+        <mdc-icon
+          class="call-control-button-cancel-icon"
+        />
+      </button>
+      <div
+        class="md-tooltip-label"
+        id="react-aria-:r19:"
+      >
+        <p>
+          End Voice
+        </p>
+      </div>
     </div>
   </div>
   <div
diff --git a/packages/contact-center/cc-components/tests/components/task/CallControlCAD/call-control-cad.snapshot.tsx b/packages/contact-center/cc-components/tests/components/task/CallControlCAD/call-control-cad.snapshot.tsx
index 8a6aa9711..139b5e8ff 100644
--- a/packages/contact-center/cc-components/tests/components/task/CallControlCAD/call-control-cad.snapshot.tsx
+++ b/packages/contact-center/cc-components/tests/components/task/CallControlCAD/call-control-cad.snapshot.tsx
@@ -3,7 +3,7 @@ import {render} from '@testing-library/react';
 import CallControlCADComponent from '../../../../src/components/task/CallControlCAD/call-control-cad';
 import {CallControlComponentProps} from '../../../../src/components/task/task.types';
 import {mockTask} from '@webex/test-fixtures';
-import {ContactServiceQueue, BuddyDetails} from '@webex/cc-store';
+import {BuddyDetails} from '@webex/cc-store';
 import '@testing-library/jest-dom';
 
 const mockUIDProps = (container: Element) => {
@@ -102,17 +102,6 @@ describe('CallControlCADComponent Snapshots', () => {
     },
   ] as BuddyDetails[];
 
-  const mockQueues: ContactServiceQueue[] = [
-    {
-      id: 'queue1',
-      name: 'Support Queue',
-    },
-    {
-      id: 'queue2',
-      name: 'Sales Queue',
-    },
-  ] as ContactServiceQueue[];
-
   const defaultProps: CallControlComponentProps = {
     currentTask: mockCurrentTask,
     wrapupCodes: mockWrapupCodes,
@@ -122,8 +111,6 @@ describe('CallControlCADComponent Snapshots', () => {
     isMuted: false,
     endCall: jest.fn(),
     wrapupCall: jest.fn(),
-    isHeld: false,
-    setIsHeld: jest.fn(),
     isRecording: false,
     setIsRecording: jest.fn(),
     buddyAgents: mockBuddyAgents,
@@ -131,43 +118,55 @@ describe('CallControlCADComponent Snapshots', () => {
     transferCall: jest.fn(),
     consultCall: jest.fn(),
     endConsultCall: jest.fn(),
-    consultInitiated: false,
     consultTransfer: jest.fn(),
-    consultCompleted: false,
-    consultAccepted: false,
     consultStartTimeStamp: 1234567890000,
     callControlAudio: null,
     consultAgentName: '',
     setConsultAgentName: jest.fn(),
-    consultAgentId: '',
-    setConsultAgentId: jest.fn(),
     holdTime: 0,
     callControlClassName: '',
     callControlConsultClassName: '',
     startTimestamp: 1234567890000,
-    queues: mockQueues,
-    loadQueues: jest.fn(),
-    isEndConsultEnabled: true,
     allowConsultToQueue: true,
     lastTargetType: 'agent',
     setLastTargetType: jest.fn(),
     controlVisibility: {
-      accept: true,
-      decline: true,
-      end: true,
-      muteUnmute: true,
-      holdResume: true,
-      consult: true,
-      transfer: true,
-      conference: true,
-      wrapup: false,
-      pauseResumeRecording: true,
-      endConsult: true,
-      recordingIndicator: true,
+      accept: {isVisible: true, isEnabled: true},
+      decline: {isVisible: true, isEnabled: true},
+      end: {isVisible: true, isEnabled: true},
+      muteUnmute: {isVisible: true, isEnabled: true},
+      muteUnmuteConsult: {isVisible: true, isEnabled: true},
+      holdResume: {isVisible: true, isEnabled: true},
+      consult: {isVisible: true, isEnabled: true},
+      transfer: {isVisible: true, isEnabled: true},
+      conference: {isVisible: true, isEnabled: true},
+      wrapup: {isVisible: false, isEnabled: false},
+      pauseResumeRecording: {isVisible: true, isEnabled: true},
+      endConsult: {isVisible: true, isEnabled: true},
+      recordingIndicator: {isVisible: true, isEnabled: true},
+      exitConference: {isVisible: false, isEnabled: false},
+      mergeConference: {isVisible: false, isEnabled: false},
+      mergeConferenceConsult: {isVisible: false, isEnabled: false},
+      consultTransfer: {isVisible: false, isEnabled: false},
+      consultTransferConsult: {isVisible: false, isEnabled: false},
+      switchToMainCall: {isVisible: false, isEnabled: false},
+      switchToConsult: {isVisible: false, isEnabled: false},
+      isConferenceInProgress: false,
+      isConsultInitiated: false,
+      isConsultInitiatedAndAccepted: false,
+      isConsultInitiatedOrAccepted: false,
+      isConsultReceived: false,
+      isHeld: false,
+      consultCallHeld: false,
     },
     logger: mockLogger,
     secondsUntilAutoWrapup: undefined,
     cancelAutoWrapup: jest.fn(),
+    exitConference: jest.fn(),
+    consultConference: jest.fn(),
+    switchToMainCall: jest.fn(),
+    switchToConsult: jest.fn(),
+    conferenceParticipants: [],
   };
 
   beforeEach(() => {
@@ -268,7 +267,10 @@ describe('CallControlCADComponent Snapshots', () => {
     // Consultation accepted
     const consultAcceptedProps = {
       ...defaultProps,
-      consultAccepted: true,
+      controlVisibility: {
+        ...defaultProps.controlVisibility,
+        isConsultInitiatedOrAccepted: true,
+      },
       consultAgentName: 'Consult Agent',
       consultStartTimeStamp: 1234567890000,
     };
@@ -296,9 +298,12 @@ describe('CallControlCADComponent Snapshots', () => {
     // Consultation with wrapup (consultation should be hidden)
     const consultWrapupProps = {
       ...defaultProps,
-      consultAccepted: true,
+      controlVisibility: {
+        ...defaultProps.controlVisibility,
+        isConsultInitiatedOrAccepted: true,
+        wrapup: true,
+      },
       consultAgentName: 'Consult Agent',
-      controlVisibility: {...defaultProps.controlVisibility, wrapup: true},
     };
     screen = render(<CallControlCADComponent {...consultWrapupProps} />);
     const wrapupContainer = screen.container.querySelector('.call-control-container');
@@ -356,7 +361,10 @@ describe('CallControlCADComponent Snapshots', () => {
       ...defaultProps,
       callControlClassName: 'custom-call-control',
       callControlConsultClassName: 'custom-consult-control',
-      consultAccepted: true,
+      controlVisibility: {
+        ...defaultProps.controlVisibility,
+        isConsultInitiatedOrAccepted: true,
+      },
       consultAgentName: 'Consult Agent',
     };
     screen = render(<CallControlCADComponent {...customProps} />);
diff --git a/packages/contact-center/cc-components/tests/components/task/CallControlCAD/call-control-cad.tsx b/packages/contact-center/cc-components/tests/components/task/CallControlCAD/call-control-cad.tsx
index 69906ac67..4ea1e4138 100644
--- a/packages/contact-center/cc-components/tests/components/task/CallControlCAD/call-control-cad.tsx
+++ b/packages/contact-center/cc-components/tests/components/task/CallControlCAD/call-control-cad.tsx
@@ -3,7 +3,7 @@ import {render} from '@testing-library/react';
 import CallControlCADComponent from '../../../../src/components/task/CallControlCAD/call-control-cad';
 import {CallControlComponentProps} from '../../../../src/components/task/task.types';
 import {mockTask} from '@webex/test-fixtures';
-import {ContactServiceQueue, BuddyDetails} from '@webex/cc-store';
+import {BuddyDetails} from '@webex/cc-store';
 import '@testing-library/jest-dom';
 
 // Mock MediaStream for testing
@@ -83,18 +83,33 @@ describe('CallControlCADComponent', () => {
   ];
 
   const mockControlVisibility = {
-    accept: true,
-    decline: true,
-    end: true,
-    muteUnmute: true,
-    holdResume: true,
-    consult: true,
-    transfer: true,
-    conference: true,
-    wrapup: false,
-    pauseResumeRecording: true,
-    endConsult: true,
-    recordingIndicator: true,
+    accept: {isVisible: true, isEnabled: true},
+    decline: {isVisible: true, isEnabled: true},
+    end: {isVisible: true, isEnabled: true},
+    muteUnmute: {isVisible: true, isEnabled: true},
+    muteUnmuteConsult: {isVisible: true, isEnabled: true},
+    holdResume: {isVisible: true, isEnabled: true},
+    consult: {isVisible: true, isEnabled: true},
+    transfer: {isVisible: true, isEnabled: true},
+    conference: {isVisible: true, isEnabled: true},
+    wrapup: {isVisible: false, isEnabled: false},
+    pauseResumeRecording: {isVisible: true, isEnabled: true},
+    endConsult: {isVisible: true, isEnabled: true},
+    recordingIndicator: {isVisible: true, isEnabled: true},
+    exitConference: {isVisible: false, isEnabled: false},
+    mergeConference: {isVisible: false, isEnabled: false},
+    mergeConferenceConsult: {isVisible: false, isEnabled: false},
+    consultTransfer: {isVisible: false, isEnabled: false},
+    consultTransferConsult: {isVisible: false, isEnabled: false},
+    switchToMainCall: {isVisible: false, isEnabled: false},
+    switchToConsult: {isVisible: false, isEnabled: false},
+    isConferenceInProgress: false,
+    isConsultInitiated: false,
+    isConsultInitiatedAndAccepted: false,
+    isConsultInitiatedOrAccepted: false,
+    isConsultReceived: false,
+    isHeld: false,
+    consultCallHeld: false,
   };
 
   const defaultProps: CallControlComponentProps = {
@@ -106,32 +121,22 @@ describe('CallControlCADComponent', () => {
     isMuted: false,
     endCall: jest.fn(),
     wrapupCall: jest.fn(),
-    isHeld: false,
-    setIsHeld: jest.fn(),
     isRecording: false,
     setIsRecording: jest.fn(),
     buddyAgents: mockBuddyAgents,
     loadBuddyAgents: jest.fn(),
-    queues: [] as ContactServiceQueue[],
-    loadQueues: jest.fn(),
     transferCall: jest.fn(),
     consultCall: jest.fn(),
     endConsultCall: jest.fn(),
-    consultInitiated: false,
     consultTransfer: jest.fn(),
-    consultCompleted: false,
-    consultAccepted: false,
     consultStartTimeStamp: Date.now(),
     callControlAudio: null as unknown as MediaStream,
     consultAgentName: '',
     setConsultAgentName: jest.fn(),
-    consultAgentId: '',
-    setConsultAgentId: jest.fn(),
     holdTime: 0,
     callControlClassName: '',
     callControlConsultClassName: '',
     startTimestamp: Date.now(),
-    isEndConsultEnabled: true,
     allowConsultToQueue: true,
     lastTargetType: 'agent',
     setLastTargetType: jest.fn(),
@@ -139,6 +144,11 @@ describe('CallControlCADComponent', () => {
     logger: mockLogger,
     secondsUntilAutoWrapup: undefined,
     cancelAutoWrapup: jest.fn(),
+    exitConference: jest.fn(),
+    consultConference: jest.fn(),
+    switchToMainCall: jest.fn(),
+    switchToConsult: jest.fn(),
+    conferenceParticipants: [],
   };
 
   beforeEach(() => {
@@ -178,7 +188,10 @@ describe('CallControlCADComponent', () => {
     // Test held state with hold time
     const heldProps = {
       ...defaultProps,
-      isHeld: true,
+      controlVisibility: {
+        ...mockControlVisibility,
+        isHeld: true,
+      },
       holdTime: 65,
     };
     const heldScreen = render(<CallControlCADComponent {...heldProps} />);
@@ -218,9 +231,12 @@ describe('CallControlCADComponent', () => {
     // Test consultation functionality for telephony
     const consultProps = {
       ...defaultProps,
-      consultAccepted: true,
       consultAgentName: 'Consult Agent',
       consultStartTimeStamp: Date.now(),
+      controlVisibility: {
+        ...mockControlVisibility,
+        isConsultInitiatedOrAccepted: true,
+      },
     };
     const consultScreen = render(<CallControlCADComponent {...consultProps} />);
     const consultContainer = consultScreen.container.querySelector('.call-control-consult-container');
@@ -241,7 +257,6 @@ describe('CallControlCADComponent', () => {
           },
         },
       },
-      consultAccepted: true,
     };
     const chatConsultScreen = render(<CallControlCADComponent {...chatConsultProps} />);
     const chatConsultContainer = chatConsultScreen.container.querySelector('.call-control-consult-container');
@@ -255,11 +270,10 @@ describe('CallControlCADComponent', () => {
       ...defaultProps,
       controlVisibility: {
         ...mockControlVisibility,
-        wrapup: true,
+        wrapup: {isVisible: true, isEnabled: true},
+        isHeld: true,
       },
-      isHeld: true,
       isRecording: true,
-      consultAccepted: true,
     };
     const screen = render(<CallControlCADComponent {...wrapupProps} />);
 
@@ -310,7 +324,10 @@ describe('CallControlCADComponent', () => {
       ...defaultProps,
       callControlClassName: 'custom-call-control',
       callControlConsultClassName: 'custom-consult-control',
-      consultAccepted: true,
+      controlVisibility: {
+        ...mockControlVisibility,
+        isConsultInitiatedOrAccepted: true,
+      },
     };
     const customScreen = render(<CallControlCADComponent {...customProps} />);
     const container = customScreen.container.querySelector('.call-control-container');
diff --git a/packages/contact-center/cc-components/tests/components/task/TaskList/task-list.snapshot.tsx b/packages/contact-center/cc-components/tests/components/task/TaskList/task-list.snapshot.tsx
index 8a6588a0d..7691f585e 100644
--- a/packages/contact-center/cc-components/tests/components/task/TaskList/task-list.snapshot.tsx
+++ b/packages/contact-center/cc-components/tests/components/task/TaskList/task-list.snapshot.tsx
@@ -49,6 +49,7 @@ describe('TaskListComponent', () => {
     isBrowser: true,
     onTaskSelect: mockOnTaskSelect,
     logger: mockLogger,
+    agentId: mockTask.data.agentId,
   };
 
   // Utility function spies
diff --git a/packages/contact-center/cc-components/tests/components/task/TaskList/task-list.tsx b/packages/contact-center/cc-components/tests/components/task/TaskList/task-list.tsx
index 06e1c62b0..29910b7b3 100644
--- a/packages/contact-center/cc-components/tests/components/task/TaskList/task-list.tsx
+++ b/packages/contact-center/cc-components/tests/components/task/TaskList/task-list.tsx
@@ -49,6 +49,7 @@ describe('TaskListComponent', () => {
     isBrowser: true,
     onTaskSelect: mockOnTaskSelect,
     logger: mockLogger,
+    agentId: '',
   };
 
   // Utility function spies
diff --git a/packages/contact-center/cc-components/tests/components/task/TaskList/task-list.utils.tsx b/packages/contact-center/cc-components/tests/components/task/TaskList/task-list.utils.tsx
index aaa5b3225..ac93a7a84 100644
--- a/packages/contact-center/cc-components/tests/components/task/TaskList/task-list.utils.tsx
+++ b/packages/contact-center/cc-components/tests/components/task/TaskList/task-list.utils.tsx
@@ -48,7 +48,7 @@ describe('task-list.utils', () => {
         mockTask.data.wrapUpRequired = false;
         mockTask.data.interaction.mediaType = MEDIA_CHANNEL.TELEPHONY;
 
-        const result = extractTaskListItemData(mockTask, true);
+        const result = extractTaskListItemData(mockTask, true, mockTask.data.agentId);
 
         expect(result.ani).toBe('1234567890');
         expect(result.customerName).toBe('John Doe');
@@ -89,7 +89,7 @@ describe('task-list.utils', () => {
         mockTask.data.interaction.mediaType = MEDIA_CHANNEL.SOCIAL;
         mockTask.data.interaction.mediaChannel = 'facebook';
 
-        const result = extractTaskListItemData(mockTask, true);
+        const result = extractTaskListItemData(mockTask, true, mockTask.data.agentId);
 
         expect(result.title).toBe('Alice Johnson'); // Customer name for social
         expect(result.isSocial).toBe(true);
@@ -127,7 +127,7 @@ describe('task-list.utils', () => {
         mockTask.data.wrapUpRequired = false;
         mockTask.data.interaction.mediaType = MEDIA_CHANNEL.TELEPHONY;
 
-        const result = extractTaskListItemData(mockTask, true);
+        const result = extractTaskListItemData(mockTask, true, mockTask.data.agentId);
 
         expect(result.ani).toBe('9876543210');
         expect(result.ronaTimeout).toBe(60); // Shows RONA timeout for incoming tasks
@@ -161,7 +161,7 @@ describe('task-list.utils', () => {
         mockTask.data.wrapUpRequired = true;
         mockTask.data.interaction.mediaType = MEDIA_CHANNEL.TELEPHONY;
 
-        const result = extractTaskListItemData(mockTask, true);
+        const result = extractTaskListItemData(mockTask, true, mockTask.data.agentId);
 
         expect(result.ani).toBe('9876543210');
         expect(result.ronaTimeout).toBeNull(); // Active tasks don't show RONA timeout
@@ -197,7 +197,7 @@ describe('task-list.utils', () => {
         mockTask.data.wrapUpRequired = false;
         mockTask.data.interaction.mediaType = MEDIA_CHANNEL.TELEPHONY;
 
-        const result = extractTaskListItemData(mockTask, false);
+        const result = extractTaskListItemData(mockTask, false, mockTask.data.agentId);
 
         expect(result.acceptText).toBe('Ringing...');
         expect(result.declineText).toBeUndefined();
@@ -229,7 +229,7 @@ describe('task-list.utils', () => {
         mockTask.data.wrapUpRequired = false;
         mockTask.data.interaction.mediaType = MEDIA_CHANNEL.SOCIAL;
 
-        const result = extractTaskListItemData(mockTask, true);
+        const result = extractTaskListItemData(mockTask, true, mockTask.data.agentId);
 
         expect(result.acceptText).toBe('Accept');
         expect(result.declineText).toBeUndefined(); // No decline for social
@@ -446,7 +446,7 @@ describe('task-list.utils', () => {
         },
       };
 
-      const handler = createTaskSelectHandler(task, currentTask, mockOnTaskSelect);
+      const handler = createTaskSelectHandler(task, currentTask, mockOnTaskSelect, mockTask.agentId);
       handler();
 
       expect(mockOnTaskSelect).toHaveBeenCalledWith(task);
@@ -477,7 +477,7 @@ describe('task-list.utils', () => {
         },
       };
 
-      const handler = createTaskSelectHandler(task, currentTask, mockOnTaskSelect);
+      const handler = createTaskSelectHandler(task, currentTask, mockOnTaskSelect, mockTask.agentId);
       handler();
 
       expect(mockOnTaskSelect).not.toHaveBeenCalled();
diff --git a/packages/contact-center/station-login/tests/helper.ts b/packages/contact-center/station-login/tests/helper.ts
index 120f628aa..d33d10769 100644
--- a/packages/contact-center/station-login/tests/helper.ts
+++ b/packages/contact-center/station-login/tests/helper.ts
@@ -603,7 +603,7 @@ describe('useStationLogin Hook', () => {
     // Simulate a change
     act(() => {
       result.current.setCurrentLoginOptions({
-        deviceType: 'DIALNUMBER',
+        deviceType: 'DIAL_NUMBER',
         dialNumber: '2002',
         teamId: 'team123',
       });
@@ -616,7 +616,7 @@ describe('useStationLogin Hook', () => {
     });
 
     expect(cc.updateAgentProfile).toHaveBeenCalledWith({
-      loginOption: 'DIALNUMBER',
+      loginOption: 'DIAL_NUMBER',
       teamId: 'team123',
       dialNumber: '2002',
     });
@@ -648,7 +648,7 @@ describe('useStationLogin Hook', () => {
     // Simulate a change
     act(() => {
       result.current.setCurrentLoginOptions({
-        deviceType: 'DIALNUMBER',
+        deviceType: 'DIAL_NUMBER',
         dialNumber: '2002',
         teamId: 'team123',
       });
diff --git a/packages/contact-center/store/package.json b/packages/contact-center/store/package.json
index c262b1a9f..bda8b5b99 100644
--- a/packages/contact-center/store/package.json
+++ b/packages/contact-center/store/package.json
@@ -22,7 +22,7 @@
     "test:styles": "eslint"
   },
   "dependencies": {
-    "@webex/contact-center": "3.9.0-next.18",
+    "@webex/contact-center": "3.10.0-next.8",
     "mobx": "6.13.5",
     "typescript": "5.6.3"
   },
@@ -59,4 +59,4 @@
     "webpack-cli": "5.1.4",
     "webpack-merge": "6.0.1"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/contact-center/store/src/constants.ts b/packages/contact-center/store/src/constants.ts
new file mode 100644
index 000000000..09ac07ed6
--- /dev/null
+++ b/packages/contact-center/store/src/constants.ts
@@ -0,0 +1,35 @@
+// Task States
+export const TASK_STATE_CONSULT = 'consult';
+export const TASK_STATE_CONSULTING = 'consulting';
+export const TASK_STATE_CONSULT_COMPLETED = 'consultCompleted';
+
+// Interaction States
+export const INTERACTION_STATE_WRAPUP = 'wrapUp';
+export const INTERACTION_STATE_POST_CALL = 'post_call';
+export const INTERACTION_STATE_CONNECTED = 'connected';
+export const INTERACTION_STATE_CONFERENCE = 'conference';
+
+// Consult States (participant.consultState)
+export const CONSULT_STATE_INITIATED = 'consultInitiated';
+export const CONSULT_STATE_COMPLETED = 'consultCompleted';
+export const CONSULT_STATE_CONFERENCING = 'conferencing';
+
+// Relationship Types
+export const RELATIONSHIP_TYPE_CONSULT = 'consult';
+
+export const AGENT = 'Agent';
+export const CUSTOMER = 'Customer';
+export const SUPERVISOR = 'Supervisor';
+/**
+ * Virtual Voice Assistant (VVA) - Automated participant type
+ * Used to identify bot/automated participants in interactions
+ */
+export const VVA = 'VVA';
+
+/**
+ * Participant types to exclude from active agent participant counts
+ * Used for filtering conference participants and consult operations
+ */
+export const EXCLUDED_PARTICIPANT_TYPES = [CUSTOMER, SUPERVISOR, VVA];
+
+export const MEDIA_TYPE_CONSULT = 'consult';
diff --git a/packages/contact-center/store/src/store.ts b/packages/contact-center/store/src/store.ts
index af58008de..3b8fec3bd 100644
--- a/packages/contact-center/store/src/store.ts
+++ b/packages/contact-center/store/src/store.ts
@@ -35,9 +35,6 @@ class Store implements IStore {
   dialNumber: string = '';
   currentState: string = '';
   customState: ICustomState = null;
-  consultCompleted = false;
-  consultInitiated = false;
-  consultAccepted = false;
   isQueueConsultInProgress = false;
   currentConsultQueueId: string = '';
   consultStartTimeStamp = undefined;
@@ -45,7 +42,6 @@ class Store implements IStore {
   lastIdleCodeChangeTimestamp?: number;
   showMultipleLoginAlert: boolean = false;
   callControlAudio: MediaStream | null = null;
-  consultOfferReceived: boolean = false;
   featureFlags: {[key: string]: boolean} = {};
   isEndConsultEnabled: boolean = false;
   isAddressBookEnabled: boolean = false;
diff --git a/packages/contact-center/store/src/store.types.ts b/packages/contact-center/store/src/store.types.ts
index 56ab781b7..55a09df1e 100644
--- a/packages/contact-center/store/src/store.types.ts
+++ b/packages/contact-center/store/src/store.types.ts
@@ -115,14 +115,10 @@ interface IStore {
   showMultipleLoginAlert: boolean;
   currentTheme: string;
   customState: ICustomState;
-  consultCompleted: boolean;
-  consultInitiated: boolean;
-  consultAccepted: boolean;
   isQueueConsultInProgress: boolean;
   currentConsultQueueId: string;
   consultStartTimeStamp?: number;
   callControlAudio: MediaStream | null;
-  consultOfferReceived: boolean;
   isEndConsultEnabled: boolean;
   allowConsultToQueue: boolean;
   agentProfile: AgentLoginProfile;
@@ -151,9 +147,6 @@ interface IStoreWrapper extends IStore {
   setIsAgentLoggedIn(value: boolean): void;
   setWrapupCodes(wrapupCodes: IWrapupCode[]): void;
   setState(state: IdleCode | ICustomState): void;
-  setConsultCompleted(value: boolean): void;
-  setConsultInitiated(value: boolean): void;
-  setConsultAccepted(value: boolean): void;
   setConsultStartTimeStamp(timestamp: number): void;
   setAgentProfile(profile: Profile): void;
   setTeamId(id: string): void;
@@ -192,6 +185,18 @@ enum TASK_EVENTS {
   TASK_RECORDING_PAUSED = 'task:recordingPaused',
   TASK_RECORDING_RESUMED = 'task:recordingResumed',
   TASK_OFFER_CONSULT = 'task:offerConsult',
+  TASK_CONFERENCE_ESTABLISHING = 'task:conferenceEstablishing',
+  TASK_CONFERENCE_STARTED = 'task:conferenceStarted',
+  TASK_CONFERENCE_FAILED = 'task:conferenceFailed',
+  TASK_CONFERENCE_ENDED = 'task:conferenceEnded',
+  TASK_PARTICIPANT_JOINED = 'task:participantJoined',
+  TASK_PARTICIPANT_LEFT = 'task:participantLeft',
+  TASK_CONFERENCE_TRANSFERRED = 'task:conferenceTransferred',
+  TASK_CONFERENCE_TRANSFER_FAILED = 'task:conferenceTransferFailed',
+  TASK_CONFERENCE_END_FAILED = 'task:conferenceEndFailed',
+  TASK_PARTICIPANT_LEFT_FAILED = 'task:participantLeftFailed',
+  TASK_MERGED = 'task:merged',
+  TASK_POST_CALL_ACTIVITY = 'task:postCallActivity',
 } // TODO: remove this once cc sdk exports this enum
 
 // Events that are received on the contact center SDK
@@ -249,7 +254,7 @@ type FetchPaginatedList<T> = (
 type TransformPaginatedData<T, U> = (item: T, page: number, index: number) => U;
 
 // Utility consts
-const DIALNUMBER: string = 'AGENT_DN';
+const DIAL_NUMBER: string = 'AGENT_DN';
 const EXTENSION: string = 'EXTENSION';
 const DESKTOP: string = 'BROWSER';
 
@@ -260,7 +265,7 @@ const DEVICE_TYPE_BROWSER = 'BROWSER';
 const AGENT_STATE_AVAILABLE = 'Available';
 
 const LoginOptions: {[key: string]: string} = {
-  [DIALNUMBER]: 'Dial Number',
+  [DIAL_NUMBER]: 'Dial Number',
   [EXTENSION]: 'Extension',
   [DESKTOP]: 'Desktop',
 };
@@ -311,7 +316,7 @@ export {
   TASK_EVENTS,
   ENGAGED_LABEL,
   ENGAGED_USERNAME,
-  DIALNUMBER,
+  DIAL_NUMBER,
   EXTENSION,
   DESKTOP,
   MEDIA_TYPE_TELEPHONY_LOWER,
@@ -321,3 +326,20 @@ export {
   LoginOptions,
   ERROR_TRIGGERING_IDLE_CODES,
 };
+
+export enum ConsultStatus {
+  NO_CONSULTATION_IN_PROGRESS = 'No consultation in progress',
+  BEING_CONSULTED = 'beingConsulted',
+  CONSULT_INITIATED = 'consultInitiated',
+  BEING_CONSULTED_ACCEPTED = 'beingConsultedAccepted',
+  CONSULT_ACCEPTED = 'consultAccepted',
+  CONNECTED = 'connected',
+  CONFERENCE = 'conference',
+  CONSULT_COMPLETED = 'consultCompleted',
+}
+
+export type Participant = {
+  id: string;
+  pType: 'Customer' | 'Agent' | string;
+  name?: string;
+};
diff --git a/packages/contact-center/store/src/storeEventsWrapper.ts b/packages/contact-center/store/src/storeEventsWrapper.ts
index bc661d9fd..45baabcd0 100644
--- a/packages/contact-center/store/src/storeEventsWrapper.ts
+++ b/packages/contact-center/store/src/storeEventsWrapper.ts
@@ -119,18 +119,6 @@ class StoreWrapper implements IStoreWrapper {
     return this.store.customState;
   }
 
-  get consultCompleted() {
-    return this.store.consultCompleted;
-  }
-
-  get consultInitiated() {
-    return this.store.consultInitiated;
-  }
-
-  get consultAccepted() {
-    return this.store.consultAccepted;
-  }
-
   get consultStartTimeStamp() {
     return this.store.consultStartTimeStamp;
   }
@@ -139,10 +127,6 @@ class StoreWrapper implements IStoreWrapper {
     return this.store.callControlAudio;
   }
 
-  get consultOfferReceived() {
-    return this.store.consultOfferReceived;
-  }
-
   get isQueueConsultInProgress() {
     return this.store.isQueueConsultInProgress;
   }
@@ -221,7 +205,7 @@ class StoreWrapper implements IStoreWrapper {
 
   setCurrentTask = (task: ITask | null, isClicked: boolean = false): void => {
     // Don't assign the task as current task is incoming
-    if (isIncomingTask(task)) return;
+    if (isIncomingTask(task, this.agentId)) return;
 
     runInAction(() => {
       // Determine if the new task is the same as the current task
@@ -260,36 +244,29 @@ class StoreWrapper implements IStoreWrapper {
   refreshTaskList = (): void => {
     runInAction(() => {
       this.store.taskList = this.store.cc.taskManager.getAllTasks();
+      const taskListKeys = Object.keys(this.store.taskList);
+
+      if (taskListKeys.length === 0) {
+        if (this.currentTask) {
+          this.handleTaskRemove(this.currentTask);
+        }
+        this.setCurrentTask(null);
+        this.setState({reset: true});
+      } else if (this.currentTask && this.store.taskList[this.currentTask.data.interactionId]) {
+        this.setCurrentTask(this.store.taskList[this.currentTask?.data?.interactionId]);
+      } else if (taskListKeys.length > 0) {
+        if (this.currentTask) {
+          this.handleTaskRemove(this.currentTask);
+        }
+        this.setCurrentTask(this.store.taskList[taskListKeys[0]]);
+      }
     });
-    if (this.currentTask) {
-      this.setCurrentTask(this.store.taskList[this.currentTask?.data?.interactionId]);
-    } else if (Object.keys(this.store.taskList).length > 0) {
-      this.setCurrentTask(this.store.taskList[Object.keys(this.store.taskList)[0]]);
-    } else if (Object.keys(this.store.taskList).length === 0) {
-      this.setCurrentTask(null);
-    }
   };
 
   setWrapupCodes = (wrapupCodes: IWrapupCode[]): void => {
     this.store.wrapupCodes = wrapupCodes;
   };
 
-  setConsultCompleted = (value: boolean): void => {
-    this.store.consultCompleted = value;
-  };
-
-  setConsultInitiated = (value: boolean): void => {
-    this.store.consultInitiated = value;
-  };
-
-  setConsultAccepted = (value: boolean): void => {
-    this.store.consultAccepted = value;
-  };
-
-  setConsultOfferReceived = (value: boolean): void => {
-    this.store.consultOfferReceived = value;
-  };
-
   setConsultStartTimeStamp = (timestamp: number): void => {
     this.store.consultStartTimeStamp = timestamp;
   };
@@ -399,22 +376,32 @@ class StoreWrapper implements IStoreWrapper {
     return this.store.registerCC(webex);
   };
 
-  handleTaskRemove = (taskId) => {
-    const taskToRemove = this.store.taskList[taskId];
+  handleTaskRemove = (taskToRemove: ITask) => {
     if (taskToRemove) {
       taskToRemove.off(TASK_EVENTS.TASK_ASSIGNED, this.handleTaskAssigned);
       taskToRemove.off(TASK_EVENTS.TASK_END, this.handleTaskEnd);
       taskToRemove.off(TASK_EVENTS.TASK_REJECT, (reason) => this.handleTaskReject(taskToRemove, reason));
-      taskToRemove.off(TASK_EVENTS.AGENT_WRAPPEDUP, this.handleTaskWrapUp);
+      taskToRemove.off(TASK_EVENTS.AGENT_WRAPPEDUP, this.refreshTaskList);
       taskToRemove.off(TASK_EVENTS.TASK_CONSULTING, this.handleConsulting);
       taskToRemove.off(TASK_EVENTS.TASK_OFFER_CONSULT, this.handleConsultOffer);
-      taskToRemove.off(TASK_EVENTS.TASK_CONSULT_END, this.handleConsultEnd);
+      taskToRemove.off(TASK_EVENTS.TASK_CONSULT_END, this.refreshTaskList);
       taskToRemove.off(TASK_EVENTS.TASK_CONSULT_ACCEPTED, this.handleConsultAccepted);
       taskToRemove.off(TASK_EVENTS.AGENT_CONSULT_CREATED, this.handleConsultCreated);
       taskToRemove.off(TASK_EVENTS.TASK_CONSULT_QUEUE_CANCELLED, this.handleConsultQueueCancelled);
       taskToRemove.off(TASK_EVENTS.AGENT_OFFER_CONTACT, this.refreshTaskList);
       taskToRemove.off(TASK_EVENTS.TASK_HOLD, this.refreshTaskList);
-      taskToRemove.off(TASK_EVENTS.TASK_UNHOLD, this.refreshTaskList);
+      taskToRemove.off(TASK_EVENTS.TASK_RESUME, this.refreshTaskList);
+      taskToRemove.off(TASK_EVENTS.TASK_CONFERENCE_ENDED, this.handleConferenceEnded);
+      taskToRemove.off(TASK_EVENTS.TASK_CONFERENCE_END_FAILED, this.refreshTaskList);
+      taskToRemove.off(TASK_EVENTS.TASK_CONFERENCE_ESTABLISHING, this.refreshTaskList);
+      taskToRemove.off(TASK_EVENTS.TASK_CONFERENCE_FAILED, this.refreshTaskList);
+      taskToRemove.off(TASK_EVENTS.TASK_PARTICIPANT_JOINED, this.handleConferenceStarted);
+      taskToRemove.off(TASK_EVENTS.TASK_PARTICIPANT_LEFT, this.handleConferenceEnded);
+      taskToRemove.off(TASK_EVENTS.TASK_PARTICIPANT_LEFT_FAILED, this.refreshTaskList);
+      taskToRemove.off(TASK_EVENTS.TASK_CONFERENCE_STARTED, this.handleConferenceStarted);
+      taskToRemove.off(TASK_EVENTS.TASK_CONFERENCE_TRANSFERRED, this.handleConferenceEnded);
+      taskToRemove.off(TASK_EVENTS.TASK_CONFERENCE_TRANSFER_FAILED, this.refreshTaskList);
+      taskToRemove.off(TASK_EVENTS.TASK_POST_CALL_ACTIVITY, this.refreshTaskList);
       if (this.deviceType === DEVICE_TYPE_BROWSER) {
         taskToRemove.off(TASK_EVENTS.TASK_MEDIA, this.handleTaskMedia);
         this.setCallControlAudio(null);
@@ -422,11 +409,7 @@ class StoreWrapper implements IStoreWrapper {
     }
 
     runInAction(() => {
-      this.setConsultAccepted(false);
-      this.setConsultInitiated(false);
-      this.setConsultCompleted(false);
-
-      if (this.store.currentTask?.data.interactionId === taskId) {
+      if (taskToRemove && this.store.currentTask?.data.interactionId === taskToRemove.data.interactionId) {
         this.setCurrentTask(null);
       }
 
@@ -457,12 +440,6 @@ class StoreWrapper implements IStoreWrapper {
       this.onTaskAssigned(task);
     }
     runInAction(() => {
-      if (this.consultAccepted) {
-        this.setConsultAccepted(false);
-        this.setConsultInitiated(false);
-        this.setConsultCompleted(false);
-        this.setConsultOfferReceived(false);
-      }
       this.setCurrentTask(task);
       this.setState({
         developerName: ENGAGED_LABEL,
@@ -471,54 +448,37 @@ class StoreWrapper implements IStoreWrapper {
     });
   };
 
-  handleTaskWrapUp = (task) => {
-    this.handleTaskRemove(task?.data?.interactionId);
-  };
-
   handleTaskMedia = (track) => {
     this.setCallControlAudio(new MediaStream([track]));
   };
 
   // Case to handle multi session
   handleConsultCreated = () => {
-    this.setConsultInitiated(true);
+    this.refreshTaskList();
     this.setConsultStartTimeStamp(Date.now());
   };
 
-  handleConsulting = (event) => {
-    this.setConsultCompleted(true);
-    this.setCurrentTask(event);
-    this.handleIncomingTask(event);
+  handleConsulting = () => {
+    this.refreshTaskList();
     this.setConsultStartTimeStamp(Date.now());
   };
 
-  handleConsultEnd = (event) => {
-    const task = event;
-    this.setConsultInitiated(false);
+  handleConsultEnd = () => {
     this.setIsQueueConsultInProgress(false);
     this.setCurrentConsultQueueId(null);
-    if (this.consultAccepted) {
-      this.setConsultAccepted(false);
-      this.handleTaskRemove(task.data.interactionId);
-    } else if (this.consultOfferReceived) {
-      this.setConsultOfferReceived(false);
-      this.handleTaskRemove(task.data.interactionId);
-    }
-    this.setConsultCompleted(false);
+    this.refreshTaskList();
     this.setConsultStartTimeStamp(null);
   };
 
   handleConsultOffer = () => {
-    this.setConsultOfferReceived(true);
+    this.refreshTaskList();
   };
 
   handleConsultAccepted = (event) => {
     const task = event;
     runInAction(() => {
-      this.setCurrentTask(task);
-      this.setConsultAccepted(true);
+      this.refreshTaskList();
       this.setConsultStartTimeStamp(Date.now());
-      this.setConsultCompleted(true);
       this.setState({
         developerName: ENGAGED_LABEL,
         name: ENGAGED_USERNAME,
@@ -530,14 +490,30 @@ class StoreWrapper implements IStoreWrapper {
   };
 
   handleConsultQueueCancelled = () => {
-    this.setConsultInitiated(false);
     this.setIsQueueConsultInProgress(false);
     this.setCurrentConsultQueueId(null);
     this.setConsultStartTimeStamp(null);
+    this.refreshTaskList();
   };
 
-  handleIncomingTask = (event) => {
-    const task: ITask = event;
+  handleConferenceStarted = () => {
+    runInAction(() => {
+      this.setIsQueueConsultInProgress(false);
+      this.setCurrentConsultQueueId(null);
+      this.setConsultStartTimeStamp(null);
+    });
+    this.refreshTaskList();
+  };
+
+  handleConferenceEnded = () => {
+    this.refreshTaskList();
+  };
+
+  /**
+   * Register all task event listeners
+   * @param task - The task to register event listeners for
+   */
+  private registerTaskEventListeners = (task: ITask): void => {
     // Attach event listeners to the task
     task.on(TASK_EVENTS.TASK_END, this.handleTaskEnd);
 
@@ -546,22 +522,42 @@ class StoreWrapper implements IStoreWrapper {
     task.on(TASK_EVENTS.AGENT_OFFER_CONTACT, this.refreshTaskList);
     task.on(TASK_EVENTS.AGENT_CONSULT_CREATED, this.handleConsultCreated);
     task.on(TASK_EVENTS.TASK_CONSULT_QUEUE_CANCELLED, this.handleConsultQueueCancelled);
-    if (this.deviceType === DEVICE_TYPE_BROWSER) {
-      task.on(TASK_EVENTS.TASK_MEDIA, this.handleTaskMedia);
-    }
 
     // When we receive TASK_REJECT sdk changes the agent status
     // When we receive TASK_REJECT that means the task was not accepted by the agent and we wont need wrap up
     task.on(TASK_EVENTS.TASK_REJECT, (reason) => this.handleTaskReject(task, reason));
 
-    task.on(TASK_EVENTS.AGENT_WRAPPEDUP, this.handleTaskWrapUp);
+    task.on(TASK_EVENTS.AGENT_WRAPPEDUP, this.refreshTaskList);
 
     task.on(TASK_EVENTS.TASK_CONSULTING, this.handleConsulting);
     task.on(TASK_EVENTS.TASK_CONSULT_ACCEPTED, this.handleConsultAccepted);
     task.on(TASK_EVENTS.TASK_OFFER_CONSULT, this.handleConsultOffer);
-    task.on(TASK_EVENTS.TASK_CONSULT_END, this.handleConsultEnd);
+    task.on(TASK_EVENTS.TASK_CONSULT_END, this.refreshTaskList);
     task.on(TASK_EVENTS.TASK_HOLD, this.refreshTaskList);
-    task.on(TASK_EVENTS.TASK_UNHOLD, this.refreshTaskList);
+    task.on(TASK_EVENTS.TASK_RESUME, this.refreshTaskList);
+    task.on(TASK_EVENTS.TASK_CONFERENCE_ENDED, this.handleConferenceEnded);
+    task.on(TASK_EVENTS.TASK_CONFERENCE_END_FAILED, this.refreshTaskList);
+    task.on(TASK_EVENTS.TASK_CONFERENCE_ESTABLISHING, this.refreshTaskList);
+    task.on(TASK_EVENTS.TASK_CONFERENCE_FAILED, this.refreshTaskList);
+    task.on(TASK_EVENTS.TASK_PARTICIPANT_JOINED, this.handleConferenceStarted);
+    task.on(TASK_EVENTS.TASK_PARTICIPANT_LEFT, this.handleConferenceEnded);
+    task.on(TASK_EVENTS.TASK_PARTICIPANT_LEFT_FAILED, this.refreshTaskList);
+    task.on(TASK_EVENTS.TASK_CONFERENCE_STARTED, this.handleConferenceStarted);
+    task.on(TASK_EVENTS.TASK_CONFERENCE_TRANSFERRED, this.refreshTaskList);
+    task.on(TASK_EVENTS.TASK_CONFERENCE_TRANSFER_FAILED, this.refreshTaskList);
+    task.on(TASK_EVENTS.TASK_POST_CALL_ACTIVITY, this.refreshTaskList);
+
+    // Register media event listener for browser devices
+    if (this.deviceType === DEVICE_TYPE_BROWSER) {
+      task.on(TASK_EVENTS.TASK_MEDIA, this.handleTaskMedia);
+    }
+  };
+
+  handleIncomingTask = (event) => {
+    const task: ITask = event;
+
+    // Register all task event listeners
+    this.registerTaskEventListeners(task);
 
     // In case of consulting we check if the task is already in the task list
     // If it is, we dont have to send the incoming task callback
@@ -598,43 +594,26 @@ class StoreWrapper implements IStoreWrapper {
     }
   };
 
-  handleTaskHydrate = (event) => {
+  handleTaskMerged = (event) => {
     const task = event;
-    task.on(TASK_EVENTS.TASK_END, this.handleTaskEnd);
-
-    // When we receive TASK_ASSIGNED the task was accepted by the agent and we need wrap up
-    task.on(TASK_EVENTS.TASK_ASSIGNED, this.handleTaskAssigned);
-    task.on(TASK_EVENTS.AGENT_OFFER_CONTACT, this.refreshTaskList);
-    task.on(TASK_EVENTS.TASK_CONSULT_ACCEPTED, this.handleConsultAccepted);
-    task.on(TASK_EVENTS.AGENT_CONSULT_CREATED, this.handleConsultCreated);
-    task.on(TASK_EVENTS.TASK_HOLD, this.refreshTaskList);
-    task.on(TASK_EVENTS.TASK_UNHOLD, this.refreshTaskList);
-
-    // When we receive TASK_REJECT sdk changes the agent status
-    // When we receive TASK_REJECT that means the task was not accepted by the agent and we wont need wrap up
-    task.on(TASK_EVENTS.TASK_REJECT, (reason) => this.handleTaskReject(task, reason));
+    this.registerTaskEventListeners(task);
+    this.refreshTaskList();
+  };
 
-    task.on(TASK_EVENTS.AGENT_WRAPPEDUP, this.handleTaskWrapUp);
+  handleTaskHydrate = (event) => {
+    const task = event;
 
-    task.on(TASK_EVENTS.TASK_CONSULTING, this.handleConsulting);
-    task.on(TASK_EVENTS.TASK_OFFER_CONSULT, this.handleConsultOffer);
-    task.on(TASK_EVENTS.TASK_CONSULT_END, this.handleConsultEnd);
-    task.on(TASK_EVENTS.TASK_CONSULT_QUEUE_CANCELLED, this.handleConsultQueueCancelled);
-    if (this.deviceType === DEVICE_TYPE_BROWSER) {
-      task.on(TASK_EVENTS.TASK_MEDIA, this.handleTaskMedia);
-    }
+    // Register all task event listeners
+    this.registerTaskEventListeners(task);
 
     this.refreshTaskList();
 
     this.setCurrentTask(task);
     if (task.data.interaction.state === 'consulting') {
       if (task.data.isConsulted) {
-        this.setConsultAccepted(true);
-      } else {
-        this.setConsultInitiated(true);
+        // this.setConsultAccepted(true);
       }
       this.setConsultStartTimeStamp(Date.now());
-      this.setConsultCompleted(true);
     }
 
     if (
@@ -653,9 +632,7 @@ class StoreWrapper implements IStoreWrapper {
     // Update call control states
     if (isTerminated) {
       if (!task.data.wrapUpRequired) {
-        this.setState({
-          reset: true,
-        });
+        this.setState({reset: true});
       }
 
       return;
@@ -666,7 +643,7 @@ class StoreWrapper implements IStoreWrapper {
     if (this.onTaskRejected) {
       this.onTaskRejected(task, reason || 'No reason provided');
     }
-    this.handleTaskRemove(task.data.interactionId);
+    this.refreshTaskList();
   };
 
   getBuddyAgents = async (
@@ -774,6 +751,7 @@ class StoreWrapper implements IStoreWrapper {
       ccSDK.on(TASK_EVENTS.TASK_HYDRATE, this.handleTaskHydrate);
       ccSDK.on(CC_EVENTS.AGENT_STATE_CHANGE, this.handleStateChange);
       ccSDK.on(TASK_EVENTS.TASK_INCOMING, this.handleIncomingTask);
+      ccSDK.on(TASK_EVENTS.TASK_MERGED, this.handleTaskMerged);
       ccSDK.on(CC_EVENTS.AGENT_MULTI_LOGIN, this.handleMultiLoginCloseSession);
       ccSDK.on(CC_EVENTS.AGENT_LOGOUT_SUCCESS, handleLogOut);
     };
@@ -786,6 +764,7 @@ class StoreWrapper implements IStoreWrapper {
       ccSDK.off(TASK_EVENTS.TASK_HYDRATE, this.handleTaskHydrate);
       ccSDK.off(CC_EVENTS.AGENT_STATE_CHANGE, this.handleStateChange);
       ccSDK.off(TASK_EVENTS.TASK_INCOMING, this.handleIncomingTask);
+      ccSDK.off(TASK_EVENTS.TASK_MERGED, this.handleTaskMerged);
       ccSDK.off(CC_EVENTS.AGENT_MULTI_LOGIN, this.handleMultiLoginCloseSession);
       ccSDK.off(CC_EVENTS.AGENT_LOGOUT_SUCCESS, handleLogOut);
     };
diff --git a/packages/contact-center/store/src/task-utils.ts b/packages/contact-center/store/src/task-utils.ts
index 240efc4bb..07bc3d085 100644
--- a/packages/contact-center/store/src/task-utils.ts
+++ b/packages/contact-center/store/src/task-utils.ts
@@ -1,20 +1,333 @@
-import {ITask} from './store.types';
+import {
+  CONSULT_STATE_COMPLETED,
+  CONSULT_STATE_CONFERENCING,
+  CONSULT_STATE_INITIATED,
+  CUSTOMER,
+  EXCLUDED_PARTICIPANT_TYPES,
+  INTERACTION_STATE_CONFERENCE,
+  INTERACTION_STATE_CONNECTED,
+  INTERACTION_STATE_POST_CALL,
+  INTERACTION_STATE_WRAPUP,
+  MEDIA_TYPE_CONSULT,
+  RELATIONSHIP_TYPE_CONSULT,
+  SUPERVISOR,
+  TASK_STATE_CONSULT,
+  TASK_STATE_CONSULT_COMPLETED,
+  TASK_STATE_CONSULTING,
+  VVA,
+} from './constants';
+import {ConsultStatus, ITask, MEDIA_TYPE_TELEPHONY_LOWER, Participant} from './store.types';
 
 /**
  * Determines if a task is an incoming task
  * @param task - The task object
  * @returns Whether the task is incoming
  */
-export const isIncomingTask = (task: ITask): boolean => {
+export const isIncomingTask = (task: ITask, agentId: string): boolean => {
   const taskData = task?.data;
   const taskState = taskData?.interaction?.state;
-  const agentId = taskData?.agentId;
   const participants = taskData?.interaction?.participants;
   const hasJoined = agentId && participants?.[agentId]?.hasJoined;
 
   return (
     !taskData?.wrapUpRequired &&
     !hasJoined &&
-    (taskState === 'new' || taskState === 'consult' || taskState === 'connected')
+    (taskState === 'new' || taskState === 'consult' || taskState === 'connected' || taskState === 'conference')
   );
 };
+
+export function getConsultMPCState(task: ITask, agentId: string): string {
+  const consultMediaResourceId = findMediaResourceId(task, 'consult');
+
+  const interaction = task.data.interaction;
+  if (
+    (!!consultMediaResourceId &&
+      !!interaction.participants[agentId]?.consultState &&
+      task.data.interaction.state !== INTERACTION_STATE_WRAPUP) ||
+    (!consultMediaResourceId && interaction.participants[agentId]?.consultState === CONSULT_STATE_COMPLETED)
+    // revisit below condition if needed for post_call scenarios in future
+    //&& task.data.interaction.state !== INTERACTION_STATE_POST_CALL // If interaction.state is post_call, we want to return post_call.
+  ) {
+    // interaction state for all agents when consult is going on
+    switch (interaction.participants[agentId]?.consultState) {
+      case CONSULT_STATE_INITIATED:
+        return TASK_STATE_CONSULT;
+      case CONSULT_STATE_COMPLETED:
+        return interaction.state === INTERACTION_STATE_CONNECTED
+          ? INTERACTION_STATE_CONNECTED
+          : TASK_STATE_CONSULT_COMPLETED;
+      case CONSULT_STATE_CONFERENCING:
+        return INTERACTION_STATE_CONFERENCE;
+      default:
+        return TASK_STATE_CONSULTING;
+    }
+  }
+
+  return interaction?.state;
+}
+
+/**
+ * Checks if the current agent is a secondary agent in a consultation scenario.
+ * Secondary agents are those who were consulted (not the original call owner).
+ * @param {Object} task - The task object containing interaction details
+ * @returns {boolean} True if this is a secondary agent (consulted party)
+ */
+export function isSecondaryAgent(task: ITask): boolean {
+  const interaction = task.data.interaction;
+
+  return (
+    !!interaction.callProcessingDetails &&
+    interaction.callProcessingDetails.relationshipType === RELATIONSHIP_TYPE_CONSULT &&
+    interaction.callProcessingDetails.parentInteractionId &&
+    interaction.callProcessingDetails.parentInteractionId !== interaction.interactionId
+  );
+}
+
+/**
+ * Checks if the current agent is a secondary EP-DN (Entry Point Dial Number) agent.
+ * This is specifically for telephony consultations to external numbers/entry points.
+ * @param {Object} task - The task object containing interaction details
+ * @returns {boolean} True if this is a secondary EP-DN agent in telephony consultation
+ */
+export function isSecondaryEpDnAgent(task: ITask): boolean {
+  return task.data.interaction.mediaType === MEDIA_TYPE_TELEPHONY_LOWER && isSecondaryAgent(task);
+}
+
+export function getTaskStatus(task: ITask, agentId: string): string {
+  const interaction = task.data.interaction;
+  if (isSecondaryEpDnAgent(task)) {
+    if (interaction.state === INTERACTION_STATE_CONFERENCE) {
+      return INTERACTION_STATE_CONFERENCE;
+    }
+    return TASK_STATE_CONSULTING; // handle state of child agent case as we cant rely on interaction state.
+  }
+  if (
+    (task.data.interaction.state === INTERACTION_STATE_WRAPUP ||
+      task.data.interaction.state === INTERACTION_STATE_POST_CALL) &&
+    interaction.participants[agentId]?.consultState === CONSULT_STATE_COMPLETED
+  ) {
+    return TASK_STATE_CONSULT_COMPLETED;
+  }
+
+  return getConsultMPCState(task, agentId);
+}
+
+export function getConsultStatus(task: ITask, agentId: string): string {
+  if (!task || !task.data) {
+    return ConsultStatus.NO_CONSULTATION_IN_PROGRESS;
+  }
+
+  const state = getTaskStatus(task, agentId);
+
+  const {interaction} = task.data;
+  const participants = interaction?.participants || {};
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const participant: any = Object.values(participants).find((p: any) => p.pType === 'Agent' && p.id === agentId);
+
+  if (state === TASK_STATE_CONSULT) {
+    if ((participant && participant.isConsulted) || isSecondaryEpDnAgent(task)) {
+      return ConsultStatus.BEING_CONSULTED;
+    }
+    return ConsultStatus.CONSULT_INITIATED;
+  } else if (state === TASK_STATE_CONSULTING) {
+    if ((participant && participant.isConsulted) || isSecondaryEpDnAgent(task)) {
+      return ConsultStatus.BEING_CONSULTED_ACCEPTED;
+    }
+    return ConsultStatus.CONSULT_ACCEPTED;
+  } else if (state === INTERACTION_STATE_CONNECTED) {
+    return ConsultStatus.CONNECTED;
+  } else if (state === INTERACTION_STATE_CONFERENCE) {
+    return ConsultStatus.CONFERENCE;
+  } else if (state === TASK_STATE_CONSULT_COMPLETED) {
+    return ConsultStatus.CONSULT_COMPLETED;
+  }
+  // Default return for states that don't match any condition (e.g., chat, email initial states)
+  return state || ConsultStatus.NO_CONSULTATION_IN_PROGRESS;
+}
+
+export function getIsConferenceInProgress(task: ITask): boolean {
+  // Early return if required data is missing
+  if (!task?.data?.interaction?.media || !task?.data?.interactionId) {
+    return false;
+  }
+
+  const mediaMainCall = task.data.interaction.media[task.data.interactionId];
+  const participantsInMainCall = new Set(mediaMainCall?.participants);
+  const participants = task?.data?.interaction?.participants;
+
+  const agentParticipants = new Set();
+  if (participantsInMainCall.size > 0 && participants) {
+    participantsInMainCall.forEach((participantId: string) => {
+      const participant = participants[participantId];
+      if (participant && ![CUSTOMER, SUPERVISOR, VVA].includes(participant.pType) && !participant.hasLeft) {
+        agentParticipants.add(participantId);
+      }
+    });
+  }
+
+  return agentParticipants.size >= 2;
+}
+
+/**
+ * Retrieves the list of active conference participants excluding the current agent
+ * Filters out customers, supervisors, VVAs, and participants who have left
+ *
+ * @param task - The task object containing interaction data
+ * @param agentId - The ID of the current agent to exclude from results
+ * @returns Array of active agent participants in the conference
+ */
+export const getConferenceParticipants = (task: ITask, agentId: string): Participant[] => {
+  const participantsList: Participant[] = [];
+
+  // Early return if required data is missing
+  if (!task?.data?.interaction?.media || !task?.data?.interactionId) {
+    return participantsList;
+  }
+
+  const mediaMainCall = task.data.interaction.media?.[task.data.interactionId];
+  const participantsInMainCall = new Set(mediaMainCall?.participants ?? []);
+  const participants = task.data.interaction.participants ?? {};
+
+  if (participantsInMainCall.size > 0 && participants) {
+    participantsInMainCall.forEach((participantId: string) => {
+      const participant = participants[participantId];
+      // Include only active agent participants (excluding current agent, customers, supervisors, and VVAs)
+      if (
+        participant &&
+        !EXCLUDED_PARTICIPANT_TYPES.includes(participant.pType) &&
+        !participant.hasLeft &&
+        participant.id !== agentId
+      ) {
+        participantsList.push({
+          id: participant.id,
+          pType: participant.pType,
+          name: participant.name ? participant.name : participant.id,
+        });
+      }
+    });
+  }
+
+  return participantsList;
+};
+
+/**
+ * Counts the number of active agent participants in the conference
+ * Excludes customers, supervisors, VVAs, and participants who have left
+ *
+ * @param task - The task object containing interaction data
+ * @returns Count of active agent participants
+ */
+export function getConferenceParticipantsCount(task: ITask): number {
+  const participantsList: Participant[] = [];
+
+  // Early return if required data is missing
+  if (!task?.data?.interaction?.media || !task?.data?.interactionId) {
+    return 0;
+  }
+
+  const mediaMainCall = task.data.interaction.media?.[task.data.interactionId];
+  const participantsInMainCall = new Set(mediaMainCall?.participants ?? []);
+  const participants = task.data.interaction.participants ?? {};
+
+  if (participantsInMainCall.size > 0 && participants) {
+    participantsInMainCall.forEach((participantId: string) => {
+      const participant = participants[participantId];
+      // Count only active agent participants (excluding customers, supervisors, and VVAs)
+      if (participant && !EXCLUDED_PARTICIPANT_TYPES.includes(participant.pType) && !participant.hasLeft) {
+        participantsList.push({
+          id: participant.id,
+          pType: participant.pType,
+          name: participant.name,
+        });
+      }
+    });
+  }
+
+  return participantsList.length;
+}
+
+export function getIsCustomerInCall(task: ITask): boolean {
+  // Early return if required data is missing
+  if (!task?.data?.interaction?.media || !task?.data?.interactionId) {
+    return false;
+  }
+
+  const mediaMainCall = task.data.interaction.media[task.data.interactionId];
+  const participantsInMainCall = new Set(mediaMainCall?.participants);
+  const participants = task?.data?.interaction?.participants;
+
+  if (participantsInMainCall.size > 0 && participants) {
+    return Array.from(participantsInMainCall).some((participantId: string) => {
+      const participant = participants[participantId];
+      return participant && participant.pType === CUSTOMER && !participant.hasLeft;
+    });
+  }
+
+  return false;
+}
+
+export function getIsConsultInProgress(task: ITask): boolean {
+  const mediaObject = task.data.interaction.media;
+  return Object.values(mediaObject).some((media) => media.mType === MEDIA_TYPE_CONSULT);
+}
+
+export function isInteractionOnHold(task: ITask): boolean {
+  if (!task || !task.data || !task.data.interaction) {
+    return false;
+  }
+  const interaction = task.data.interaction;
+  if (!interaction.media) {
+    return false;
+  }
+  return Object.values(interaction.media).some((media) => media.isHold);
+}
+
+export const setmTypeForEPDN = (task: ITask, mType: string) => {
+  if (isSecondaryEpDnAgent(task)) {
+    return 'mainCall';
+  }
+
+  return mType;
+};
+export const findMediaResourceId = (task: ITask, mType: string) => {
+  for (const key in task.data.interaction.media) {
+    if (task.data.interaction.media[key].mType === mType) {
+      return task.data.interaction.media[key].mediaResourceId;
+    }
+  }
+
+  return '';
+};
+
+const isConsultOnHoldMPC = (task: ITask, agentId: string): boolean => {
+  const isInConsultState = [TASK_STATE_CONSULT, TASK_STATE_CONSULTING].includes(getConsultMPCState(task, agentId));
+  const consultMediaResourceId = task.data.consultMediaResourceId;
+  const isConsultHold = consultMediaResourceId && task.data.interaction.media[consultMediaResourceId]?.isHold;
+
+  return isInConsultState && !isConsultHold;
+};
+
+export const findHoldStatus = (task: ITask, mType: string, agentId: string): boolean => {
+  const interaction = task.data.interaction;
+  if (!interaction) {
+    return false;
+  }
+  mType = setmTypeForEPDN(task, mType); // set mType if agent is secondary EPDN agent
+  const mediaId = findMediaResourceId(task, mType);
+  // custom mainCall hold status for agent who initiated the consult.
+  if (
+    mType === 'mainCall' &&
+    interaction.media[mediaId]?.participants.includes(agentId) &&
+    (isConsultOnHoldMPC(task, agentId) || [TASK_STATE_CONSULT_COMPLETED].includes(getConsultMPCState(task, agentId)))
+  ) {
+    return true;
+  }
+
+  // hold status for agents who are in consulting call(consulting agent | consulted agent)
+
+  return mType === TASK_STATE_CONSULT && interaction.media[mediaId]
+    ? interaction.media[mediaId].participants.includes(agentId)
+      ? interaction.media[mediaId].isHold
+      : false
+    : (interaction.media[mediaId] && interaction.media[mediaId].isHold) || false; // For all the other agent for main whatever is the status of main call hold
+};
diff --git a/packages/contact-center/store/tests/storeEventsWrapper.ts b/packages/contact-center/store/tests/storeEventsWrapper.ts
index 8f8e913ce..e497f3fc4 100644
--- a/packages/contact-center/store/tests/storeEventsWrapper.ts
+++ b/packages/contact-center/store/tests/storeEventsWrapper.ts
@@ -44,13 +44,7 @@ jest.mock('../src/store', () => ({
         getEntries: jest.fn(),
       },
       taskManager: {
-        getAllTasks: jest.fn().mockReturnValue({
-          interaction1: {
-            data: {
-              interactionId: 'interaction1',
-            },
-          },
-        }),
+        getAllTasks: jest.fn().mockReturnValue({}),
       },
     },
     logger: {
@@ -82,11 +76,7 @@ jest.mock('../src/store', () => ({
     ],
     agentId: 'mockAgentId',
     wrapupCodes: [],
-    currentTask: {
-      data: {
-        interactionId: 'mockInteractionId',
-      },
-    },
+    currentTask: null,
     isAgentLoggedIn: false,
     deviceType: 'BROWSER',
     dialNumber: '12345',
@@ -99,12 +89,8 @@ jest.mock('../src/store', () => ({
     showMultipleLoginAlert: 'mockShowMultipleLoginAlert',
     currentTheme: 'mockCurrentTheme',
     customState: 'mockCustomState',
-    consultCompleted: false,
-    consultInitiated: false,
-    consultAccepted: false,
     consultStartTimeStamp: null,
     callControlAudio: null,
-    consultOfferReceived: false,
     isQueueConsultInProgress: false,
     currentConsultQueueId: null,
     isEndConsultEnabled: true,
@@ -175,6 +161,8 @@ describe('storeEventsWrapper', () => {
     });
 
     it('should proxy currentTask', () => {
+      // Set the store's agentId to match the task's agentId
+      storeWrapper['store'].agentId = 'agent1';
       const mockCurrentTask = {
         data: {
           interactionId: 'mockInteractionId',
@@ -246,14 +234,6 @@ describe('storeEventsWrapper', () => {
       expect(storeWrapper['store'].customState).not.toBeNull();
     });
 
-    it('should proxy consultCompleted', () => {
-      expect(storeWrapper.consultCompleted).toBe(false);
-    });
-
-    it('should proxy consultInitiated', () => {
-      expect(storeWrapper.consultInitiated).toBe(false);
-    });
-
     it('should proxy isQueueConsultInProgress', () => {
       expect(storeWrapper.isQueueConsultInProgress).toBe(false);
     });
@@ -426,6 +406,8 @@ describe('storeEventsWrapper', () => {
       let mockTask: ITask;
       beforeEach(() => {
         mockTask = mockTaskFixture;
+        // Reset currentTask to null before test
+        storeWrapper['store'].currentTask = null;
         // mock return the task list from cc.taskManager
         storeWrapper['store'].cc.taskManager.getAllTasks = jest
           .fn()
@@ -521,6 +503,8 @@ describe('storeEventsWrapper', () => {
     });
 
     it('should handle incoming task and call onIncomingTask callback', () => {
+      // Set the store's agentId to match the task's agentId
+      storeWrapper['store'].agentId = 'agent1';
       storeWrapper.setCurrentTask(null);
       const mockIncomingTaskCallback = jest.fn();
       storeWrapper.setIncomingTaskCb(mockIncomingTaskCallback);
@@ -563,7 +547,8 @@ describe('storeEventsWrapper', () => {
       expect(mockIncomingTaskCallback).toHaveBeenCalledWith({task: mockTask2});
 
       // Verify that the correct event handlers were registered
-      expect(storeWrapper.currentTask).toBe(null);
+      // Note: currentTask should remain as mockTaskWithJoined because incoming tasks are not set as current
+      expect(storeWrapper.currentTask).toBeTruthy();
       expect(mockTask2.on).toHaveBeenCalledWith(TASK_EVENTS.TASK_END, expect.any(Function));
       expect(mockTask2.on).toHaveBeenCalledWith(TASK_EVENTS.TASK_ASSIGNED, expect.any(Function));
       expect(mockTask2.on).toHaveBeenCalledWith(TASK_EVENTS.AGENT_CONSULT_CREATED, expect.any(Function));
@@ -574,7 +559,7 @@ describe('storeEventsWrapper', () => {
       expect(mockTask2.on).toHaveBeenCalledWith(TASK_EVENTS.TASK_CONSULT_QUEUE_CANCELLED, expect.any(Function));
       expect(mockTask2.on).toHaveBeenCalledWith(TASK_EVENTS.AGENT_WRAPPEDUP, expect.any(Function));
       expect(mockTask2.on).toHaveBeenCalledWith(TASK_EVENTS.TASK_HOLD, storeWrapper.refreshTaskList);
-      expect(mockTask2.on).toHaveBeenCalledWith(TASK_EVENTS.TASK_UNHOLD, storeWrapper.refreshTaskList);
+      expect(mockTask2.on).toHaveBeenCalledWith(TASK_EVENTS.TASK_RESUME, storeWrapper.refreshTaskList);
     });
 
     it('should handle consulting i.e handleIncomingTask with the task already present in the taskList', () => {
@@ -644,22 +629,6 @@ describe('storeEventsWrapper', () => {
       expect(mockTask.on).toHaveBeenCalledWith(TASK_EVENTS.AGENT_CONSULT_CREATED, expect.any(Function));
     });
 
-    it('should handle task assignment and reset consult flags if consultAccepted is true', () => {
-      const setCurrentTaskSpy = jest.spyOn(storeWrapper, 'setCurrentTask');
-      const consultAcceptedSpy = jest.spyOn(storeWrapper, 'setConsultAccepted');
-      const consultInitiatedSpy = jest.spyOn(storeWrapper, 'setConsultInitiated');
-      const consultCompletedSpy = jest.spyOn(storeWrapper, 'setConsultCompleted');
-      // simulate consultAccepted true
-      storeWrapper['store'].consultAccepted = true;
-
-      storeWrapper.handleTaskAssigned(mockTask);
-      expect(setCurrentTaskSpy).toHaveBeenCalledWith(mockTask);
-      // new consult-reset checks
-      expect(consultAcceptedSpy).toHaveBeenCalledWith(false);
-      expect(consultInitiatedSpy).toHaveBeenCalledWith(false);
-      expect(consultCompletedSpy).toHaveBeenCalledWith(false);
-    });
-
     it('should handle task assignment and call onTaskAssigned callback', () => {
       const mockTaskAssignedCallback = jest.fn();
       storeWrapper.setTaskAssigned(mockTaskAssignedCallback);
@@ -670,63 +639,33 @@ describe('storeEventsWrapper', () => {
 
     it('should handle consultAccepted event', () => {
       const setCurrentTaskSpy = jest.spyOn(storeWrapper, 'setCurrentTask');
-      const consultAcceptedSpy = jest.spyOn(storeWrapper, 'setConsultAccepted');
       const setStateSpy = jest.spyOn(storeWrapper, 'setState');
 
+      // Mock getAllTasks to return the mockTask
+      storeWrapper['store'].cc.taskManager.getAllTasks = jest
+        .fn()
+        .mockReturnValue({[mockTask.data.interactionId]: mockTask});
+      storeWrapper['store'].currentTask = mockTask;
+
       storeWrapper.handleConsultAccepted(mockTask);
       expect(setCurrentTaskSpy).toHaveBeenCalledWith(mockTask);
-      expect(consultAcceptedSpy).toHaveBeenCalledWith(true);
       expect(setStateSpy).toHaveBeenCalledWith({
         developerName: 'ENGAGED',
         name: 'Engaged',
       });
     });
 
-    it('should handle consultEnd event when consultAccepted is true', () => {
-      const consultInitiatedSpy = jest.spyOn(storeWrapper, 'setConsultInitiated');
-      const consultAcceptedSpy = jest.spyOn(storeWrapper, 'setConsultAccepted');
-      const consultCompletedSpy = jest.spyOn(storeWrapper, 'setConsultCompleted');
-      const handleTaskRemoveSpy = jest.spyOn(storeWrapper, 'handleTaskRemove');
-      // simulate consultAccepted true
-      storeWrapper['store'].consultAccepted = true;
-      const event = {data: {interactionId: 'testId'}};
-
-      storeWrapper.handleConsultEnd(event);
-      expect(consultInitiatedSpy).toHaveBeenCalledWith(false);
-      expect(consultAcceptedSpy).toHaveBeenCalledWith(false);
-      expect(consultCompletedSpy).toHaveBeenCalledWith(false);
-      expect(handleTaskRemoveSpy).toHaveBeenCalledWith('testId');
-    });
-
-    it('should handle consultEnd event when consultAccepted is true', () => {
-      const setConsultOfferReceivedSpy = jest.spyOn(storeWrapper, 'setConsultOfferReceived');
-      const handleTaskRemoveSpy = jest.spyOn(storeWrapper, 'handleTaskRemove');
-      // simulate consultAccepted true
-      storeWrapper['store'].consultAccepted = false;
-      storeWrapper['store'].consultOfferReceived = true;
-      const event = {data: {interactionId: 'testId'}};
-
-      storeWrapper.handleConsultEnd(event);
-
-      expect(setConsultOfferReceivedSpy).toHaveBeenCalledWith(false);
-      expect(handleTaskRemoveSpy).toHaveBeenCalledWith('testId');
-    });
-
     it('should handle consult event', () => {
-      const consultCompletedSpy = jest.spyOn(storeWrapper, 'setConsultCompleted');
       const setCurrentTaskSpy = jest.spyOn(storeWrapper, 'setCurrentTask');
 
-      storeWrapper.handleConsulting(mockTask);
-      expect(consultCompletedSpy).toHaveBeenCalledWith(true);
-      expect(setCurrentTaskSpy).toHaveBeenCalledWith(mockTask);
-    });
-
-    it('handle consult offer method', () => {
-      const setConsultOfferReceivedSpy = jest.spyOn(storeWrapper, 'setConsultOfferReceived');
-
-      storeWrapper.handleConsultOffer();
+      // Mock getAllTasks to return the mockTask
+      storeWrapper['store'].cc.taskManager.getAllTasks = jest
+        .fn()
+        .mockReturnValue({[mockTask.data.interactionId]: mockTask});
+      storeWrapper['store'].currentTask = mockTask;
 
-      expect(setConsultOfferReceivedSpy).toHaveBeenCalledWith(true);
+      storeWrapper.handleConsulting();
+      expect(setCurrentTaskSpy).toHaveBeenCalledWith(mockTask);
     });
 
     it('should handle task media', () => {
@@ -748,12 +687,12 @@ describe('storeEventsWrapper', () => {
       storeWrapper.refreshTaskList();
       storeWrapper['store'].currentTask = mockTask;
 
-      storeWrapper.handleTaskRemove(mockTask.data.interactionId);
+      storeWrapper.handleTaskRemove(mockTask);
 
       expect(mockTask.off).toHaveBeenCalledWith(TASK_EVENTS.TASK_ASSIGNED, expect.any(Function));
       expect(mockTask.off).toHaveBeenCalledWith(TASK_EVENTS.TASK_END, expect.any(Function));
       expect(mockTask.off).toHaveBeenCalledWith(TASK_EVENTS.TASK_HOLD, storeWrapper.refreshTaskList);
-      expect(mockTask.off).toHaveBeenCalledWith(TASK_EVENTS.TASK_UNHOLD, storeWrapper.refreshTaskList);
+      expect(mockTask.off).toHaveBeenCalledWith(TASK_EVENTS.TASK_RESUME, storeWrapper.refreshTaskList);
 
       expect(refreshTaskListSpy).toHaveBeenCalledWith();
       expect(setCurrentTaskSpy).toHaveBeenCalledWith(null);
@@ -762,17 +701,18 @@ describe('storeEventsWrapper', () => {
     it('should handle task removal when no task is present', () => {
       storeWrapper['store'].taskList = {};
       storeWrapper['store'].currentTask = null;
-      storeWrapper.handleTaskRemove('someRandomId');
+      storeWrapper.handleTaskRemove(storeWrapper['store'].currentTask);
 
       expect(mockTask.off).not.toHaveBeenCalledWith(TASK_EVENTS.TASK_ASSIGNED, expect.any(Function));
       expect(mockTask.off).not.toHaveBeenCalledWith(TASK_EVENTS.TASK_END, expect.any(Function));
       const refreshTaskListSpy = jest.spyOn(storeWrapper, 'refreshTaskList');
       const setCurrentTaskSpy = jest.spyOn(storeWrapper, 'setCurrentTask');
 
-      storeWrapper.handleTaskRemove('someRandomId');
+      storeWrapper.handleTaskRemove(storeWrapper['store'].currentTask);
 
       expect(refreshTaskListSpy).toHaveBeenCalledWith();
-      expect(setCurrentTaskSpy).not.toHaveBeenCalledWith(null);
+      // When task list is empty and currentTask is null, setCurrentTask(null) is still called to ensure state consistency
+      expect(setCurrentTaskSpy).toHaveBeenCalled();
     });
 
     it('should set selected login option', () => {
@@ -844,14 +784,11 @@ describe('storeEventsWrapper', () => {
     });
 
     it('should handle consultQueueCancelled event', () => {
-      const consultInitiatedSpy = jest.spyOn(storeWrapper, 'setConsultInitiated');
       const isQueueConsultInProgressSpy = jest.spyOn(storeWrapper, 'setIsQueueConsultInProgress');
       const currentConsultQueueIdSpy = jest.spyOn(storeWrapper, 'setCurrentConsultQueueId');
       const consultStartTimeStampSpy = jest.spyOn(storeWrapper, 'setConsultStartTimeStamp');
 
       storeWrapper.handleConsultQueueCancelled();
-
-      expect(consultInitiatedSpy).toHaveBeenCalledWith(false);
       expect(isQueueConsultInProgressSpy).toHaveBeenCalledWith(false);
       expect(currentConsultQueueIdSpy).toHaveBeenCalledWith(null);
       expect(consultStartTimeStampSpy).toHaveBeenCalledWith(null);
@@ -991,6 +928,7 @@ describe('storeEventsWrapper', () => {
 
       expect(onSpy).toHaveBeenCalledWith(TASK_EVENTS.TASK_HYDRATE, expect.any(Function));
       expect(onSpy).toHaveBeenCalledWith(TASK_EVENTS.TASK_INCOMING, expect.any(Function));
+      expect(onSpy).toHaveBeenCalledWith(TASK_EVENTS.TASK_MERGED, expect.any(Function));
       expect(onSpy).toHaveBeenCalledWith(CC_EVENTS.AGENT_STATE_CHANGE, expect.any(Function));
       expect(onSpy).toHaveBeenCalledWith(CC_EVENTS.AGENT_MULTI_LOGIN, expect.any(Function));
 
@@ -1078,7 +1016,7 @@ describe('storeEventsWrapper', () => {
         .mockReturnValue({[mockTask.data.interactionId]: mockTask});
       storeWrapper.refreshTaskList();
       storeWrapper['store'].currentTask = mockTask;
-      storeWrapper.handleTaskRemove(mockTask.data.interactionId);
+      storeWrapper.handleTaskRemove(mockTask);
 
       expect(mockTask.off).toHaveBeenCalledWith(TASK_EVENTS.TASK_ASSIGNED, expect.any(Function));
       expect(mockTask.off).toHaveBeenCalledWith(TASK_EVENTS.TASK_END, expect.any(Function));
@@ -1239,14 +1177,56 @@ describe('storeEventsWrapper', () => {
       expect(mockTask.on).toHaveBeenCalledWith(TASK_EVENTS.AGENT_WRAPPEDUP, expect.any(Function));
       expect(mockTask.on).toHaveBeenCalledWith(TASK_EVENTS.TASK_REJECT, expect.any(Function));
       expect(mockTask.on).toHaveBeenCalledWith(TASK_EVENTS.TASK_HOLD, storeWrapper.refreshTaskList);
-      expect(mockTask.on).toHaveBeenCalledWith(TASK_EVENTS.TASK_UNHOLD, storeWrapper.refreshTaskList);
+      expect(mockTask.on).toHaveBeenCalledWith(TASK_EVENTS.TASK_RESUME, storeWrapper.refreshTaskList);
+
+      // Simulate task removal from task manager after wrapup
+      storeWrapper['store'].cc.taskManager.getAllTasks = jest.fn().mockReturnValue({});
 
       act(() => {
         const mockWrapupCb = mockTask.on.mock.calls.find((call) => call[0] === TASK_EVENTS.AGENT_WRAPPEDUP)[1];
         mockWrapupCb(mockTask);
       });
 
-      expect(handleTaskRemoveSpy).toHaveBeenCalledWith(mockTask.data.interactionId);
+      expect(handleTaskRemoveSpy).toHaveBeenCalledWith(mockTask);
+    });
+
+    it('should handle task merged event', async () => {
+      const onSpy = jest.spyOn(storeWrapper['cc'], 'on');
+      const refreshTaskListSpy = jest.spyOn(storeWrapper, 'refreshTaskList');
+
+      const cc = storeWrapper['store'].cc;
+      storeWrapper['store'].init = jest.fn().mockReturnValue(storeWrapper.setupIncomingTaskHandler(cc));
+
+      await storeWrapper.init(options);
+
+      act(() => {
+        onSpy.mock.calls[1][1]({});
+      });
+
+      const mockMergedTask = {
+        data: {
+          interactionId: 'mergedTask1',
+          interaction: {
+            state: 'connected',
+          },
+        },
+        on: jest.fn(),
+        off: jest.fn(),
+      };
+
+      expect(onSpy).toHaveBeenCalledWith(TASK_EVENTS.TASK_MERGED, expect.any(Function));
+
+      const taskMergedCb = onSpy.mock.calls.find((call) => call[0] === TASK_EVENTS.TASK_MERGED)[1];
+
+      act(() => {
+        taskMergedCb(mockMergedTask);
+      });
+
+      expect(refreshTaskListSpy).toHaveBeenCalled();
+      expect(mockMergedTask.on).toHaveBeenCalledWith(TASK_EVENTS.TASK_END, expect.any(Function));
+      expect(mockMergedTask.on).toHaveBeenCalledWith(TASK_EVENTS.TASK_ASSIGNED, expect.any(Function));
+      expect(mockMergedTask.on).toHaveBeenCalledWith(TASK_EVENTS.AGENT_WRAPPEDUP, expect.any(Function));
+      expect(mockMergedTask.on).toHaveBeenCalledWith(TASK_EVENTS.TASK_REJECT, expect.any(Function));
     });
 
     describe('customStates on hydration', () => {
@@ -1297,6 +1277,8 @@ describe('storeEventsWrapper', () => {
         const cc = storeWrapper['store'].cc;
         const onSpy = jest.spyOn(cc, 'on');
 
+        // Set the store's agentId to match the task's agentId
+        storeWrapper['store'].agentId = 'agent1';
         storeWrapper['store'].init = jest.fn().mockReturnValue(storeWrapper.setupIncomingTaskHandler(cc));
         storeWrapper['store'].taskList = {};
 
@@ -1326,8 +1308,7 @@ describe('storeEventsWrapper', () => {
           hydrateTaskCb(mockTask);
         });
 
-        expect(setStateSpy).toHaveBeenCalledTimes(2);
-
+        // Note: setState may be called an additional time due to task hydration and refresh logic
         expect(setStateSpy).toHaveBeenCalledWith({
           reset: true,
         });
@@ -1393,6 +1374,7 @@ describe('storeEventsWrapper', () => {
 
       expect(storeWrapper['cc'].off).toHaveBeenCalledWith(TASK_EVENTS.TASK_HYDRATE, expect.any(Function));
       expect(storeWrapper['cc'].off).toHaveBeenCalledWith(TASK_EVENTS.TASK_INCOMING, expect.any(Function));
+      expect(storeWrapper['cc'].off).toHaveBeenCalledWith(TASK_EVENTS.TASK_MERGED, expect.any(Function));
       expect(storeWrapper['cc'].off).toHaveBeenCalledWith(CC_EVENTS.AGENT_STATE_CHANGE, expect.any(Function));
       expect(storeWrapper['cc'].off).toHaveBeenCalledWith(CC_EVENTS.AGENT_MULTI_LOGIN, expect.any(Function));
       expect(setAgentProfileSpy).toHaveBeenCalledWith({});
@@ -1408,7 +1390,6 @@ describe('storeEventsWrapper', () => {
 
       const rejectTaskOnSpy = jest.spyOn(rejectTask, 'on');
       const onTaskRejectedMock = jest.fn();
-      const removeSpy = jest.spyOn(storeWrapper, 'handleTaskRemove');
 
       storeWrapper.setTaskRejected(onTaskRejectedMock);
       storeWrapper['store'].cc.taskManager.getAllTasks = jest
@@ -1417,6 +1398,9 @@ describe('storeEventsWrapper', () => {
       storeWrapper.refreshTaskList();
       storeWrapper.handleIncomingTask(rejectTask);
 
+      // Set up spy after handleIncomingTask to avoid capturing unrelated calls
+      const removeSpy = jest.spyOn(storeWrapper, 'handleTaskRemove');
+
       const taskRejectCall = rejectTaskOnSpy.mock.calls.find((call) => call[0] === TASK_EVENTS.TASK_REJECT);
 
       expect(taskRejectCall).toBeDefined();
@@ -1424,13 +1408,19 @@ describe('storeEventsWrapper', () => {
       const rejectCallback = taskRejectCall[1];
       const reason = 'Task Rejected Reason';
 
+      // Ensure currentTask is set to rejectTask before rejection
+      storeWrapper['store'].currentTask = rejectTask;
+
+      // Simulate task removal from task manager after rejection
+      storeWrapper['store'].cc.taskManager.getAllTasks = jest.fn().mockReturnValue({});
+
       rejectCallback(reason);
 
       // Ensure the correct arguments are passed to onTaskRejectedMock
       expect(onTaskRejectedMock).toHaveBeenCalledWith(rejectTask, reason);
 
-      // Ensure handleTaskRemove is called with the correct interactionId
-      expect(removeSpy).toHaveBeenCalledWith(rejectTask.data.interactionId);
+      // Ensure handleTaskRemove is called with the correct task object
+      expect(removeSpy).toHaveBeenCalledWith(rejectTask);
     });
 
     it('should handle task rejection event and call onTaskRejected with no reason', () => {
@@ -1443,24 +1433,32 @@ describe('storeEventsWrapper', () => {
 
       const onTaskRejectedMock = jest.fn();
       storeWrapper.setTaskRejected(onTaskRejectedMock);
-      const removeSpy = jest.spyOn(storeWrapper, 'handleTaskRemove');
       storeWrapper['store'].cc.taskManager.getAllTasks = jest
         .fn()
         .mockReturnValue({[rejectTask.data.interactionId]: rejectTask});
       storeWrapper.refreshTaskList();
       storeWrapper.handleIncomingTask(rejectTask);
 
+      // Set up spy after handleIncomingTask to avoid capturing unrelated calls
+      const removeSpy = jest.spyOn(storeWrapper, 'handleTaskRemove');
+
       const taskRejectCall = rejectTaskOnSpy.mock.calls.find((call) => call[0] === TASK_EVENTS.TASK_REJECT);
       expect(taskRejectCall).toBeDefined();
       const rejectCallback = taskRejectCall[1];
 
+      // Ensure currentTask is set to rejectTask before rejection
+      storeWrapper['store'].currentTask = rejectTask;
+
+      // Simulate task removal from task manager after rejection
+      storeWrapper['store'].cc.taskManager.getAllTasks = jest.fn().mockReturnValue({});
+
       rejectCallback();
 
       // Ensure the correct arguments are passed to onTaskRejectedMock
       expect(onTaskRejectedMock).toHaveBeenCalledWith(rejectTask, 'No reason provided');
       onTaskRejectedMock.mockClear();
 
-      expect(removeSpy).toHaveBeenCalledWith(rejectTask.data.interactionId);
+      expect(removeSpy).toHaveBeenCalledWith(rejectTask);
 
       storeWrapper.setTaskRejected(undefined);
       storeWrapper['store'].cc.taskManager.getAllTasks = jest
@@ -1476,22 +1474,16 @@ describe('storeEventsWrapper', () => {
       // Ensure the correct arguments are passed to onTaskRejectedMock
       expect(onTaskRejectedMock).not.toHaveBeenCalledWith(rejectTask, 'No reason provided');
 
-      // Ensure handleTaskRemove is called with the correct interactionId
-      expect(removeSpy).toHaveBeenCalledWith(rejectTask.data.interactionId);
+      // Ensure handleTaskRemove is called with the correct task object
+      expect(removeSpy).toHaveBeenCalledWith(rejectTask);
     });
 
     it('should handle consultEnd event and reset queue consult state', () => {
-      const consultInitiatedSpy = jest.spyOn(storeWrapper, 'setConsultInitiated');
       const isQueueConsultInProgressSpy = jest.spyOn(storeWrapper, 'setIsQueueConsultInProgress');
       const currentConsultQueueIdSpy = jest.spyOn(storeWrapper, 'setCurrentConsultQueueId');
-      // simulate consultAccepted false
-      storeWrapper['store'].consultAccepted = false;
-      storeWrapper['store'].consultOfferReceived = false;
-      const event = {data: {interactionId: 'testId'}};
 
-      storeWrapper.handleConsultEnd(event);
+      storeWrapper.handleConsultEnd();
 
-      expect(consultInitiatedSpy).toHaveBeenCalledWith(false);
       expect(isQueueConsultInProgressSpy).toHaveBeenCalledWith(false);
       expect(currentConsultQueueIdSpy).toHaveBeenCalledWith(null);
     });
@@ -1570,7 +1562,6 @@ describe('storeEventsWrapper', () => {
 
         expect(refreshTaskListSpy).toHaveBeenCalled();
         expect(setCurrentTaskSpy).toHaveBeenCalledWith(consultingMockTask);
-        expect(storeWrapper['store'].consultAccepted).toBe(true);
       });
 
       it('should set states when state is consulting and isConsulting is false', () => {
@@ -1598,7 +1589,6 @@ describe('storeEventsWrapper', () => {
 
         expect(refreshTaskListSpy).toHaveBeenCalled();
         expect(setCurrentTaskSpy).toHaveBeenCalledWith(consultingMockTask);
-        expect(storeWrapper['store'].consultInitiated).toBe(true);
         expect(setStateSpy).not.toHaveBeenCalledWith({reset: true});
       });
     });
@@ -1645,7 +1635,7 @@ describe('storeEventsWrapper', () => {
       storeWrapper['store'].deviceType = 'BROWSER';
 
       // Call handleTaskRemove
-      storeWrapper.handleTaskRemove(mockTask.data.interactionId);
+      storeWrapper.handleTaskRemove(mockTask);
 
       // Verify TASK_MEDIA handler was removed
       expect(mockTask.off).toHaveBeenCalledWith(TASK_EVENTS.TASK_MEDIA, expect.any(Function));
@@ -1661,7 +1651,7 @@ describe('storeEventsWrapper', () => {
       storeWrapper['store'].taskList = {mockTask: mockTask};
 
       // Call handleTaskRemove
-      storeWrapper.handleTaskRemove(mockTask.data.interactionId);
+      storeWrapper.handleTaskRemove(mockTask);
 
       // Verify TASK_MEDIA handler was not removed
       const taskMediaOffCall = mockTaskOffSpy.mock.calls.find((call) => call[0] === TASK_EVENTS.TASK_MEDIA);
@@ -1723,11 +1713,9 @@ describe('storeEventsWrapper', () => {
     Date.now = jest.fn(() => 1234567890);
 
     const setConsultStartTimeStampSpy = jest.spyOn(storeWrapper, 'setConsultStartTimeStamp');
-    const setConsultInitiatedSpy = jest.spyOn(storeWrapper, 'setConsultInitiated');
 
     storeWrapper.handleConsultCreated();
 
-    expect(setConsultInitiatedSpy).toHaveBeenCalledWith(true);
     expect(setConsultStartTimeStampSpy).toHaveBeenCalledWith(1234567890);
     jest.clearAllMocks();
   });
@@ -1737,6 +1725,8 @@ describe('storeEventsWrapper', () => {
     let mockTaskB: ITask;
 
     beforeEach(() => {
+      // Set the store's agentId to match the tasks' agentId
+      storeWrapper['store'].agentId = 'agent1';
       mockTaskA = {
         data: {
           interactionId: 'taskA',
@@ -1765,13 +1755,9 @@ describe('storeEventsWrapper', () => {
           agentId: 'agent1',
         },
       } as ITask;
-      storeWrapper['store'].consultCompleted = true;
-      storeWrapper['store'].consultInitiated = true;
-      storeWrapper['store'].consultAccepted = true;
       storeWrapper['store'].isQueueConsultInProgress = true;
       storeWrapper['store'].currentConsultQueueId = 'queue1';
       storeWrapper['store'].consultStartTimeStamp = 123;
-      storeWrapper['store'].consultOfferReceived = true;
       storeWrapper['store'].currentTask = null;
       storeWrapper.onTaskSelected = undefined;
     });
diff --git a/packages/contact-center/store/tests/task-utils.ts b/packages/contact-center/store/tests/task-utils.ts
index 44b0320fb..06b34c3a7 100644
--- a/packages/contact-center/store/tests/task-utils.ts
+++ b/packages/contact-center/store/tests/task-utils.ts
@@ -1,4 +1,9 @@
-import {isIncomingTask} from '../src/task-utils';
+import {
+  isIncomingTask,
+  getIsConferenceInProgress,
+  getConferenceParticipants,
+  getConferenceParticipantsCount,
+} from '../src/task-utils';
 import {mockTask} from '../../test-fixtures/src/fixtures';
 import {ITask} from '../src/store.types';
 
@@ -30,7 +35,7 @@ describe('isIncomingTask', () => {
           },
         };
 
-        const result = isIncomingTask(testTask);
+        const result = isIncomingTask(testTask, 'agent1');
         expect(result).toBe(true);
       });
     });
@@ -47,7 +52,7 @@ describe('isIncomingTask', () => {
           participants: undefined,
         },
       };
-      expect(isIncomingTask(testTask)).toBe(true);
+      expect(isIncomingTask(testTask, 'agent1')).toBe(true);
 
       // Test with undefined agentId
       testTask.data = {
@@ -60,7 +65,7 @@ describe('isIncomingTask', () => {
           participants: {agent1: {hasJoined: false}},
         },
       };
-      expect(isIncomingTask(testTask)).toBe(true);
+      expect(isIncomingTask(testTask, undefined as unknown as string)).toBe(true);
     });
   });
 
@@ -77,7 +82,7 @@ describe('isIncomingTask', () => {
           participants: {agent1: {hasJoined: false}},
         },
       };
-      expect(isIncomingTask(testTask)).toBe(false);
+      expect(isIncomingTask(testTask, 'agent1')).toBe(false);
 
       // Test agent has already joined
       testTask.data = {
@@ -90,7 +95,7 @@ describe('isIncomingTask', () => {
           participants: {agent1: {hasJoined: true}},
         },
       };
-      expect(isIncomingTask(testTask)).toBe(false);
+      expect(isIncomingTask(testTask, 'agent1')).toBe(false);
     });
 
     it('should return false for invalid task states', () => {
@@ -107,7 +112,7 @@ describe('isIncomingTask', () => {
             participants: {agent1: {hasJoined: false}},
           },
         };
-        expect(isIncomingTask(testTask)).toBe(false);
+        expect(isIncomingTask(testTask, 'agent1')).toBe(false);
       });
     });
   });
@@ -115,10 +120,10 @@ describe('isIncomingTask', () => {
   describe('edge cases', () => {
     it('should handle invalid task data gracefully', () => {
       // Null/undefined tasks
-      expect(isIncomingTask(null as unknown as ITask)).toBe(false);
-      expect(isIncomingTask(undefined as unknown as ITask)).toBe(false);
-      expect(isIncomingTask({} as ITask)).toBe(false);
-      expect(isIncomingTask({data: null} as unknown as ITask)).toBe(false);
+      expect(isIncomingTask(null as unknown as ITask, 'agent1')).toBe(false);
+      expect(isIncomingTask(undefined as unknown as ITask, 'agent1')).toBe(false);
+      expect(isIncomingTask({} as ITask, 'agent1')).toBe(false);
+      expect(isIncomingTask({data: null} as unknown as ITask, 'agent1')).toBe(false);
 
       // Missing interaction
       testTask.data = {
@@ -127,7 +132,7 @@ describe('isIncomingTask', () => {
         agentId: 'agent1',
         interaction: undefined,
       } as unknown as ITask['data'];
-      expect(isIncomingTask(testTask)).toBe(false);
+      expect(isIncomingTask(testTask, 'agent1')).toBe(false);
     });
 
     it('should handle participant edge cases correctly', () => {
@@ -142,7 +147,7 @@ describe('isIncomingTask', () => {
           participants: {},
         },
       };
-      expect(isIncomingTask(testTask)).toBe(true);
+      expect(isIncomingTask(testTask, 'agent1')).toBe(true);
 
       // Agent not found in participants
       testTask.data = {
@@ -155,7 +160,7 @@ describe('isIncomingTask', () => {
           participants: {agent2: {hasJoined: true}},
         },
       };
-      expect(isIncomingTask(testTask)).toBe(true);
+      expect(isIncomingTask(testTask, 'agent1')).toBe(true);
 
       // Multiple agents with different join states - only current agent matters
       testTask.data = {
@@ -171,7 +176,836 @@ describe('isIncomingTask', () => {
           },
         },
       };
-      expect(isIncomingTask(testTask)).toBe(true);
+      expect(isIncomingTask(testTask, 'agent1')).toBe(true);
     });
   });
 });
+
+// Helper function to create properly typed partial task objects for testing
+const createMockTask = (data: Partial<ITask['data']>): ITask => {
+  return {
+    ...mockTask,
+    data: {
+      ...mockTask.data,
+      ...data,
+    } as ITask['data'],
+  };
+};
+
+// Helper to create partial interaction data with proper typing
+const createPartialInteraction = (interaction: unknown): ITask['data']['interaction'] => {
+  return interaction as ITask['data']['interaction'];
+};
+
+describe('getIsConferenceInProgress', () => {
+  it('should return false when task data is missing', () => {
+    const task = {} as Partial<ITask> as ITask;
+    expect(getIsConferenceInProgress(task)).toBe(false);
+  });
+
+  it('should return false when interaction media is missing', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({}),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(false);
+  });
+
+  it('should return false when interactionId is missing', () => {
+    const task = createMockTask({
+      interaction: createPartialInteraction({
+        media: {},
+      }),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(false);
+  });
+
+  it('should return false when there are no participants', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: [],
+          },
+        },
+        participants: {},
+      }),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(false);
+  });
+
+  it('should return false when there is only one agent participant', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(false);
+  });
+
+  it('should return true when there are two or more agent participants', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(true);
+  });
+
+  it('should exclude customer participants from agent count', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'customer1'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+          customer1: {
+            id: 'customer1',
+            pType: 'Customer',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(false);
+  });
+
+  it('should exclude supervisor participants from agent count', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'supervisor1'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+          supervisor1: {
+            id: 'supervisor1',
+            pType: 'Supervisor',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(false);
+  });
+
+  it('should exclude VVA participants from agent count', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'vva1'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+          vva1: {
+            id: 'vva1',
+            pType: 'VVA',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(false);
+  });
+
+  it('should exclude participants who have left from agent count', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            hasLeft: true,
+          },
+        },
+      }),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(false);
+  });
+
+  it('should return true with three or more agent participants', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2', 'agent3'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+          agent3: {
+            id: 'agent3',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(true);
+  });
+});
+
+describe('getConferenceParticipants', () => {
+  const currentAgentId = 'agent1';
+
+  it('should return empty array when task data is missing', () => {
+    const task = {} as Partial<ITask> as ITask;
+    expect(getConferenceParticipants(task, currentAgentId)).toEqual([]);
+  });
+
+  it('should return empty array when interaction media is missing', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({}),
+    });
+    expect(getConferenceParticipants(task, currentAgentId)).toEqual([]);
+  });
+
+  it('should return empty array when interactionId is missing', () => {
+    const task = createMockTask({
+      interaction: createPartialInteraction({
+        media: {},
+      }),
+    });
+    expect(getConferenceParticipants(task, currentAgentId)).toEqual([]);
+  });
+
+  it('should return empty array when there are no participants', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: [],
+          },
+        },
+        participants: {},
+      }),
+    });
+    expect(getConferenceParticipants(task, currentAgentId)).toEqual([]);
+  });
+
+  it('should return list of agent participants excluding current agent', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2', 'agent3'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            name: 'Agent One',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            name: 'Agent Two',
+            hasLeft: false,
+          },
+          agent3: {
+            id: 'agent3',
+            pType: 'Agent',
+            name: 'Agent Three',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+
+    const result = getConferenceParticipants(task, currentAgentId);
+
+    expect(result).toHaveLength(2);
+    expect(result).toContainEqual({
+      id: 'agent2',
+      pType: 'Agent',
+      name: 'Agent Two',
+    });
+    expect(result).toContainEqual({
+      id: 'agent3',
+      pType: 'Agent',
+      name: 'Agent Three',
+    });
+    expect(result).not.toContainEqual(
+      expect.objectContaining({
+        id: 'agent1',
+      })
+    );
+  });
+
+  it('should exclude customer participants', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2', 'customer1'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            name: 'Agent One',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            name: 'Agent Two',
+            hasLeft: false,
+          },
+          customer1: {
+            id: 'customer1',
+            pType: 'Customer',
+            name: 'Customer One',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+
+    const result = getConferenceParticipants(task, currentAgentId);
+
+    expect(result).toHaveLength(1);
+    expect(result).toContainEqual({
+      id: 'agent2',
+      pType: 'Agent',
+      name: 'Agent Two',
+    });
+  });
+
+  it('should exclude supervisor participants', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2', 'supervisor1'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            name: 'Agent One',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            name: 'Agent Two',
+            hasLeft: false,
+          },
+          supervisor1: {
+            id: 'supervisor1',
+            pType: 'Supervisor',
+            name: 'Supervisor One',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+
+    const result = getConferenceParticipants(task, currentAgentId);
+
+    expect(result).toHaveLength(1);
+    expect(result).toContainEqual({
+      id: 'agent2',
+      pType: 'Agent',
+      name: 'Agent Two',
+    });
+  });
+
+  it('should exclude VVA participants', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2', 'vva1'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            name: 'Agent One',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            name: 'Agent Two',
+            hasLeft: false,
+          },
+          vva1: {
+            id: 'vva1',
+            pType: 'VVA',
+            name: 'VVA One',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+
+    const result = getConferenceParticipants(task, currentAgentId);
+
+    expect(result).toHaveLength(1);
+    expect(result).toContainEqual({
+      id: 'agent2',
+      pType: 'Agent',
+      name: 'Agent Two',
+    });
+  });
+
+  it('should exclude participants who have left', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2', 'agent3'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            name: 'Agent One',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            name: 'Agent Two',
+            hasLeft: false,
+          },
+          agent3: {
+            id: 'agent3',
+            pType: 'Agent',
+            name: 'Agent Three',
+            hasLeft: true,
+          },
+        },
+      }),
+    });
+
+    const result = getConferenceParticipants(task, currentAgentId);
+
+    expect(result).toHaveLength(1);
+    expect(result).toContainEqual({
+      id: 'agent2',
+      pType: 'Agent',
+      name: 'Agent Two',
+    });
+  });
+
+  it('should handle participants without names by using participant ID', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+
+    const result = getConferenceParticipants(task, currentAgentId);
+
+    expect(result).toHaveLength(1);
+    expect(result).toContainEqual({
+      id: 'agent2',
+      pType: 'Agent',
+      name: 'agent2',
+    });
+  });
+});
+
+describe('getConferenceParticipantsCount', () => {
+  it('should return 0 when task data is missing', () => {
+    const task = {} as Partial<ITask> as ITask;
+    expect(getConferenceParticipantsCount(task)).toBe(0);
+  });
+
+  it('should return 0 when interaction media is missing', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({}),
+    });
+    expect(getConferenceParticipantsCount(task)).toBe(0);
+  });
+
+  it('should return 0 when interactionId is missing', () => {
+    const task = createMockTask({
+      interaction: createPartialInteraction({
+        media: {},
+      }),
+    });
+    expect(getConferenceParticipantsCount(task)).toBe(0);
+  });
+
+  it('should return 0 when there are no participants', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: [],
+          },
+        },
+        participants: {},
+      }),
+    });
+    expect(getConferenceParticipantsCount(task)).toBe(0);
+  });
+
+  it('should return count of agent participants including current agent', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2', 'agent3'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            name: 'Agent One',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            name: 'Agent Two',
+            hasLeft: false,
+          },
+          agent3: {
+            id: 'agent3',
+            pType: 'Agent',
+            name: 'Agent Three',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+
+    expect(getConferenceParticipantsCount(task)).toBe(3);
+  });
+
+  it('should exclude customer participants from count', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2', 'customer1'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            name: 'Agent One',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            name: 'Agent Two',
+            hasLeft: false,
+          },
+          customer1: {
+            id: 'customer1',
+            pType: 'Customer',
+            name: 'Customer One',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+
+    expect(getConferenceParticipantsCount(task)).toBe(2);
+  });
+
+  it('should exclude supervisor participants from count', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2', 'supervisor1'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            name: 'Agent One',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            name: 'Agent Two',
+            hasLeft: false,
+          },
+          supervisor1: {
+            id: 'supervisor1',
+            pType: 'Supervisor',
+            name: 'Supervisor One',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+
+    expect(getConferenceParticipantsCount(task)).toBe(2);
+  });
+
+  it('should exclude VVA participants from count', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2', 'vva1'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            name: 'Agent One',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            name: 'Agent Two',
+            hasLeft: false,
+          },
+          vva1: {
+            id: 'vva1',
+            pType: 'VVA',
+            name: 'VVA One',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+
+    expect(getConferenceParticipantsCount(task)).toBe(2);
+  });
+
+  it('should exclude participants who have left from count', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2', 'agent3'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            name: 'Agent One',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            name: 'Agent Two',
+            hasLeft: false,
+          },
+          agent3: {
+            id: 'agent3',
+            pType: 'Agent',
+            name: 'Agent Three',
+            hasLeft: true,
+          },
+        },
+      }),
+    });
+
+    expect(getConferenceParticipantsCount(task)).toBe(2);
+  });
+
+  it('should return count of 1 for single agent', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            name: 'Agent One',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+
+    expect(getConferenceParticipantsCount(task)).toBe(1);
+  });
+
+  it('should handle mixed participant types correctly', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2', 'agent3', 'customer1', 'supervisor1', 'vva1', 'agent4'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            name: 'Agent One',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            name: 'Agent Two',
+            hasLeft: false,
+          },
+          agent3: {
+            id: 'agent3',
+            pType: 'Agent',
+            name: 'Agent Three',
+            hasLeft: true, // This one left
+          },
+          agent4: {
+            id: 'agent4',
+            pType: 'Agent',
+            name: 'Agent Four',
+            hasLeft: false,
+          },
+          customer1: {
+            id: 'customer1',
+            pType: 'Customer',
+            name: 'Customer One',
+            hasLeft: false,
+          },
+          supervisor1: {
+            id: 'supervisor1',
+            pType: 'Supervisor',
+            name: 'Supervisor One',
+            hasLeft: false,
+          },
+          vva1: {
+            id: 'vva1',
+            pType: 'VVA',
+            name: 'VVA One',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+
+    // Should count only agent1, agent2, and agent4 (agent3 has left, others are excluded types)
+    expect(getConferenceParticipantsCount(task)).toBe(3);
+  });
+});
diff --git a/packages/contact-center/task/src/CallControl/index.tsx b/packages/contact-center/task/src/CallControl/index.tsx
index 41412f7d5..2f740ced8 100644
--- a/packages/contact-center/task/src/CallControl/index.tsx
+++ b/packages/contact-center/task/src/CallControl/index.tsx
@@ -8,21 +8,26 @@ import {CallControlProps} from '../task.types';
 import {CallControlComponent} from '@webex/cc-components';
 
 const CallControlInternal: React.FunctionComponent<CallControlProps> = observer(
-  ({onHoldResume, onEnd, onWrapUp, onRecordingToggle, onToggleMute, consultTransferOptions}) => {
+  ({
+    onHoldResume,
+    onEnd,
+    onWrapUp,
+    onRecordingToggle,
+    onToggleMute,
+    consultTransferOptions,
+    multiPartyConferenceEnabled,
+  }) => {
     const {
       logger,
       currentTask,
       wrapupCodes,
-      consultInitiated,
-      consultCompleted,
-      consultAccepted,
       consultStartTimeStamp,
       callControlAudio,
       deviceType,
       featureFlags,
-      isEndConsultEnabled,
       allowConsultToQueue,
       isMuted,
+      agentId,
     } = store;
 
     const result = {
@@ -34,18 +39,15 @@ const CallControlInternal: React.FunctionComponent<CallControlProps> = observer(
         onRecordingToggle,
         onToggleMute,
         logger,
-        consultInitiated,
         deviceType,
         featureFlags,
         isMuted,
+        multiPartyConferenceEnabled,
+        agentId,
       }),
       wrapupCodes,
-      consultInitiated,
-      consultCompleted,
-      consultAccepted,
       consultStartTimeStamp,
       callControlAudio,
-      isEndConsultEnabled,
       allowConsultToQueue,
       logger,
       consultTransferOptions,
@@ -63,7 +65,7 @@ const CallControl: React.FunctionComponent<CallControlProps> = (props) => {
         if (store.onErrorCallback) store.onErrorCallback('CallControl', error);
       }}
     >
-      <CallControlInternal {...props} />
+      <CallControlInternal {...props} multiPartyConferenceEnabled={props.multiPartyConferenceEnabled ?? true} />
     </ErrorBoundary>
   );
 };
diff --git a/packages/contact-center/task/src/CallControlCAD/index.tsx b/packages/contact-center/task/src/CallControlCAD/index.tsx
index caa9d736d..24979239d 100644
--- a/packages/contact-center/task/src/CallControlCAD/index.tsx
+++ b/packages/contact-center/task/src/CallControlCAD/index.tsx
@@ -16,22 +16,20 @@ const CallControlCADInternal: React.FunctionComponent<CallControlProps> = observ
     onToggleMute,
     callControlClassName,
     callControlConsultClassName,
+    multiPartyConferenceEnabled,
     consultTransferOptions,
   }) => {
     const {
       logger,
       currentTask,
       wrapupCodes,
-      consultInitiated,
-      consultAccepted,
       consultStartTimeStamp,
       callControlAudio,
-      consultCompleted,
-      isEndConsultEnabled,
       allowConsultToQueue,
       featureFlags,
       deviceType,
       isMuted,
+      agentId,
     } = store;
     const result = {
       ...useCallControl({
@@ -42,20 +40,17 @@ const CallControlCADInternal: React.FunctionComponent<CallControlProps> = observ
         onRecordingToggle,
         onToggleMute,
         logger,
-        consultInitiated,
         deviceType,
         featureFlags,
         isMuted,
+        multiPartyConferenceEnabled,
+        agentId,
       }),
       wrapupCodes,
-      consultInitiated,
-      consultCompleted,
-      consultAccepted,
       consultStartTimeStamp,
       callControlAudio,
       callControlClassName,
       callControlConsultClassName,
-      isEndConsultEnabled,
       allowConsultToQueue,
       logger,
       consultTransferOptions,
@@ -73,7 +68,7 @@ const CallControlCAD: React.FunctionComponent<CallControlProps> = (props) => {
         if (store.onErrorCallback) store.onErrorCallback('CallControlCAD', error);
       }}
     >
-      <CallControlCADInternal {...props} />
+      <CallControlCADInternal {...props} multiPartyConferenceEnabled={props.multiPartyConferenceEnabled ?? true} />
     </ErrorBoundary>
   );
 };
diff --git a/packages/contact-center/task/src/TaskList/index.tsx b/packages/contact-center/task/src/TaskList/index.tsx
index 999c317ac..3cd675c52 100644
--- a/packages/contact-center/task/src/TaskList/index.tsx
+++ b/packages/contact-center/task/src/TaskList/index.tsx
@@ -9,13 +9,14 @@ import {TaskListProps} from '../task.types';
 
 const TaskListInternal: React.FunctionComponent<TaskListProps> = observer(
   ({onTaskAccepted, onTaskDeclined, onTaskSelected}) => {
-    const {cc, taskList, currentTask, deviceType, logger} = store;
+    const {cc, taskList, currentTask, deviceType, logger, agentId} = store;
 
     const result = useTaskList({cc, deviceType, logger, taskList, onTaskAccepted, onTaskDeclined, onTaskSelected});
     const props = {
       ...result,
       currentTask,
       logger,
+      agentId,
     };
 
     return <TaskListComponent {...props} />;
diff --git a/packages/contact-center/task/src/Utils/constants.ts b/packages/contact-center/task/src/Utils/constants.ts
new file mode 100644
index 000000000..dcad63c28
--- /dev/null
+++ b/packages/contact-center/task/src/Utils/constants.ts
@@ -0,0 +1,6 @@
+// Media Types
+export const MEDIA_TYPE_TELEPHONY = 'telephony';
+export const MEDIA_TYPE_CHAT = 'chat';
+export const MEDIA_TYPE_EMAIL = 'email';
+export const MAX_PARTICIPANTS_IN_MULTIPARTY_CONFERENCE = 7;
+export const MAX_PARTICIPANTS_IN_THREE_PARTY_CONFERENCE = 2;
diff --git a/packages/contact-center/task/src/Utils/task-util.ts b/packages/contact-center/task/src/Utils/task-util.ts
index 95dea2710..24f997584 100644
--- a/packages/contact-center/task/src/Utils/task-util.ts
+++ b/packages/contact-center/task/src/Utils/task-util.ts
@@ -1,48 +1,561 @@
-import {ILogger} from '@webex/cc-store';
-import {ITask} from '@webex/contact-center';
+import {
+  ILogger,
+  DIAL_NUMBER,
+  EXTENSION,
+  DESKTOP,
+  ConsultStatus,
+  getConsultStatus,
+  getIsConsultInProgress,
+  getIsCustomerInCall,
+  getConferenceParticipantsCount,
+  findHoldStatus,
+} from '@webex/cc-store';
+import {ITask, Interaction} from '@webex/contact-center';
+import {Visibility} from '@webex/cc-components';
+import {
+  MEDIA_TYPE_TELEPHONY,
+  MEDIA_TYPE_CHAT,
+  MEDIA_TYPE_EMAIL,
+  MAX_PARTICIPANTS_IN_MULTIPARTY_CONFERENCE,
+  MAX_PARTICIPANTS_IN_THREE_PARTY_CONFERENCE,
+} from './constants';
+import {DeviceTypeFlags} from '../task.types';
+
+// ==================== UTILITY FUNCTIONS ====================
+
+/**
+ * Helper function to get device type flags to avoid repetition
+ */
+function getDeviceTypeFlags(deviceType: string): DeviceTypeFlags {
+  return {
+    isBrowser: deviceType === DESKTOP,
+    isAgentDN: deviceType === DIAL_NUMBER,
+    isExtension: deviceType === EXTENSION,
+  };
+}
+
+/**
+ * Helper function to check if telephony is supported for the device
+ */
+function isTelephonySupported(deviceType: string, webRtcEnabled: boolean): boolean {
+  const {isBrowser, isAgentDN, isExtension} = getDeviceTypeFlags(deviceType);
+  return (isBrowser && webRtcEnabled) || isAgentDN || isExtension;
+}
+
+export function findHoldTimestamp(interaction: Interaction, mType = 'mainCall'): number | null {
+  if (interaction?.media) {
+    const media = Object.values(interaction.media).find((m) => m.mType === mType);
+    return media?.holdTimestamp ?? null;
+  }
+  return null;
+}
+
+// ==================== CALL CONTROL BUTTON VISIBILITY FUNCTIONS ====================
+
+/**
+ * Get visibility for Accept button
+ */
+export function getAcceptButtonVisibility(
+  isBrowser: boolean,
+  isPhoneDevice: boolean,
+  webRtcEnabled: boolean,
+  isCall: boolean,
+  isDigitalChannel: boolean
+): Visibility {
+  const isVisible =
+    (isBrowser && ((webRtcEnabled && isCall) || isDigitalChannel)) || (isPhoneDevice && isDigitalChannel);
+
+  return {isVisible, isEnabled: true};
+}
+
+/**
+ * Get visibility for Decline button
+ */
+export function getDeclineButtonVisibility(isBrowser: boolean, webRtcEnabled: boolean, isCall: boolean): Visibility {
+  const isVisible = isBrowser && webRtcEnabled && isCall;
+
+  return {isVisible, isEnabled: true};
+}
+
+/**
+ * Get visibility for End button
+ */
+export function getEndButtonVisibility(
+  isBrowser: boolean,
+  isEndCallEnabled: boolean,
+  isCall: boolean,
+  isConsultInitiatedOrAcceptedOrBeingConsulted: boolean,
+  isConferenceInProgress: boolean,
+  isConsultCompleted: boolean,
+  isHeld: boolean
+): Visibility {
+  const isVisible = isBrowser || (isEndCallEnabled && isCall) || !isCall;
+  // Disable if: held (except when in conference and consult not completed) OR consult in progress
+  const isEnabled =
+    (!isHeld || (isConferenceInProgress && !isConsultCompleted)) && !isConsultInitiatedOrAcceptedOrBeingConsulted;
+
+  return {isVisible, isEnabled};
+}
+
+/**
+ * Get visibility for Mute/Unmute button
+ */
+export function getMuteUnmuteButtonVisibility(
+  isBrowser: boolean,
+  webRtcEnabled: boolean,
+  isCall: boolean,
+  isBeingConsulted: boolean
+): Visibility {
+  const isVisible = isBrowser && webRtcEnabled && isCall && !isBeingConsulted;
+
+  return {isVisible, isEnabled: true};
+}
+
+/**
+ * Get visibility for Hold/Resume button
+ */
+export function getHoldResumeButtonVisibility(
+  isTelephonySupported: boolean,
+  isCall: boolean,
+  isConferenceInProgress: boolean,
+  isConsultInProgress: boolean,
+  isHeld: boolean,
+  isBeingConsulted: boolean,
+  isConsultCompleted: boolean
+): Visibility {
+  const isVisible = isCall && isTelephonySupported && !isBeingConsulted;
+  // Enable if: (NOT in conference AND NOT in consult) OR (in conference AND consult completed AND held)
+  const isEnabled =
+    (!isConferenceInProgress && !isConsultInProgress) || (isConferenceInProgress && isConsultCompleted && isHeld);
+
+  return {isVisible, isEnabled};
+}
+
+// ==================== RECORDING FUNCTIONS ====================
+
+/**
+ * Get visibility for Pause/Resume Recording button
+ */
+export function getPauseResumeRecordingButtonVisibility(
+  isTelephonySupported: boolean,
+  isCall: boolean,
+  isConferenceInProgress: boolean,
+  isConsultInitiatedOrAccepted: boolean
+): Visibility {
+  const isVisible = isCall && isTelephonySupported && !isConferenceInProgress && !isConsultInitiatedOrAccepted;
+
+  return {isVisible, isEnabled: true};
+}
+
+/**
+ * Get visibility for Recording Indicator
+ */
+export function getRecordingIndicatorVisibility(isCall: boolean): Visibility {
+  return {isVisible: isCall, isEnabled: true};
+}
+
+// ==================== TRANSFER AND CONFERENCE FUNCTIONS ====================
+
+/**
+ * Get visibility for Transfer button
+ */
+export function getTransferButtonVisibility(
+  isTransferVisibility: boolean,
+  isConferenceInProgress: boolean,
+  isConsultInitiatedOrAccepted: boolean
+): Visibility {
+  const isVisible = isTransferVisibility && !isConferenceInProgress && !isConsultInitiatedOrAccepted;
+
+  return {isVisible, isEnabled: true};
+}
+
+/**
+ * Get visibility for Conference button
+ */
+export function getConferenceButtonVisibility(
+  isBrowser: boolean,
+  webRtcEnabled: boolean,
+  isCall: boolean,
+  isChat: boolean,
+  isBeingConsulted: boolean
+): Visibility {
+  const isVisible = ((isBrowser && isCall && webRtcEnabled) || isChat) && !isBeingConsulted;
+
+  return {isVisible, isEnabled: true};
+}
+
+/**
+ * Get visibility for Conference In Progress indicator
+ */
+export function getConferenceInProgressVisibility(task: ITask): boolean {
+  return task?.data?.isConferenceInProgress ?? false;
+}
+
+/**
+ * Get visibility for Exit Conference button
+ */
+export function getExitConferenceButtonVisibility(
+  isConferenceInProgress: boolean,
+  isConsultInitiatedOrAccepted: boolean,
+  consultCallHeld: boolean,
+  isHeld: boolean,
+  isConsultCompleted: boolean
+): Visibility {
+  const isVisible = isConferenceInProgress && !isConsultInitiatedOrAccepted;
+  const isConferenceWithConsultNotHeld = isConferenceInProgress && isConsultInitiatedOrAccepted && !consultCallHeld;
+  // Disable if: conference with consult not held OR (held AND in conference AND consult completed)
+  const isEnabled = !isConferenceWithConsultNotHeld && !(isHeld && isConferenceInProgress && isConsultCompleted);
+
+  return {isVisible, isEnabled};
+}
+
+/**
+ * Get visibility for Merge Conference button
+ */
+export function getMergeConferenceButtonVisibility(
+  isConsultInitiatedOrAccepted: boolean,
+  isConsultAccepted: boolean,
+  consultCallHeld: boolean,
+  isConferenceInProgress: boolean,
+  isCustomerInCall: boolean
+): Visibility {
+  const isVisible = isConsultInitiatedOrAccepted && isCustomerInCall;
+  const isConferenceWithConsultNotHeld = isConferenceInProgress && isConsultInitiatedOrAccepted && !consultCallHeld;
+  const isEnabled = isConsultAccepted && consultCallHeld && !isConferenceWithConsultNotHeld;
+
+  return {isVisible, isEnabled};
+}
+
+// ==================== CONSULT FUNCTIONS ====================
+
+/**
+ * Get visibility for Consult button
+ */
+export function getConsultButtonVisibility(
+  isTelephonySupported: boolean,
+  isCall: boolean,
+  isConsultInProgress: boolean,
+  isCustomerInCall: boolean,
+  conferenceParticipantsCount: number,
+  maxParticipantsInConference: number,
+  isBeingConsulted: boolean,
+  isHeld: boolean,
+  isConsultCompleted: boolean,
+  isConferenceInProgress: boolean
+): Visibility {
+  const isVisible = isCall && isTelephonySupported && !isBeingConsulted;
+  const isEnabled =
+    conferenceParticipantsCount < maxParticipantsInConference &&
+    !isConsultInProgress &&
+    isCustomerInCall &&
+    !(isHeld && isConferenceInProgress && !isConsultCompleted);
+
+  return {isVisible, isEnabled};
+}
+
+/**
+ * Get visibility for End Consult button
+ */
+export function getEndConsultButtonVisibility(
+  isEndConsultEnabled: boolean,
+  isTelephonySupported: boolean,
+  isCall: boolean,
+  isConsultInitiatedOrAccepted: boolean
+): Visibility {
+  const isVisible = isEndConsultEnabled && isCall && isTelephonySupported && isConsultInitiatedOrAccepted;
+
+  return {isVisible, isEnabled: true};
+}
+
+/**
+ * Get visibility for Consult Transfer button
+ */
+export function getConsultTransferButtonVisibility(
+  isConsultInitiatedOrAccepted: boolean,
+  isConsultAccepted: boolean,
+  consultCallHeld: boolean,
+  isConferenceInProgress: boolean,
+  isCustomerInCall: boolean
+): Visibility {
+  const isVisible = isConsultInitiatedOrAccepted && isCustomerInCall;
+  const isConferenceWithConsultNotHeld = isConferenceInProgress && isConsultInitiatedOrAccepted && !consultCallHeld;
+  const isEnabled = isConsultAccepted && consultCallHeld && !isConferenceWithConsultNotHeld;
+
+  return {isVisible, isEnabled};
+}
+
+/**
+ * Get visibility for Merge Conference Consult button
+ */
+export function getMergeConferenceConsultButtonVisibility(
+  isConsultAccepted: boolean,
+  isConsultInitiated: boolean,
+  consultCallHeld: boolean,
+  isCustomerInCall: boolean
+): Visibility {
+  const isVisible = isConsultAccepted || isConsultInitiated;
+  const isEnabled = !consultCallHeld && isConsultAccepted && isCustomerInCall;
+
+  return {isVisible, isEnabled};
+}
+
+/**
+ * Get visibility for Consult Transfer Consult button
+ */
+export function getConsultTransferConsultButtonVisibility(
+  isConsultAccepted: boolean,
+  isConsultInitiated: boolean,
+  consultCallHeld: boolean,
+  isCustomerInCall: boolean
+): Visibility {
+  const isVisible = isConsultAccepted || isConsultInitiated;
+  const isEnabled = !consultCallHeld && isConsultAccepted && isCustomerInCall;
+
+  return {isVisible, isEnabled};
+}
+
+/**
+ * Get visibility for Mute/Unmute Consult button
+ */
+export function getMuteUnmuteConsultButtonVisibility(
+  isBrowser: boolean,
+  webRtcEnabled: boolean,
+  isCall: boolean,
+  isConsultInitiated: boolean,
+  isBeingConsulted: boolean
+): Visibility {
+  const isVisible = isBrowser && webRtcEnabled && isCall && (isConsultInitiated || isBeingConsulted);
+
+  return {isVisible, isEnabled: true};
+}
+
+// ==================== SWITCH CALL FUNCTIONS ====================
+
+/**
+ * Get visibility for Switch to Main Call button
+ */
+export function getSwitchToMainCallButtonVisibility(
+  isBeingConsulted: boolean,
+  isConsultAccepted: boolean,
+  isConsultInitiated: boolean,
+  consultCallHeld: boolean,
+  isCustomerInCall: boolean,
+  isConferenceInProgress: boolean
+): Visibility {
+  const isVisible = !isBeingConsulted && (isConsultAccepted || isConsultInitiated) && !consultCallHeld;
+  const isEnabled = isConsultAccepted && (isCustomerInCall || (!isCustomerInCall && isConferenceInProgress));
+
+  return {isVisible, isEnabled};
+}
+
+/**
+ * Get visibility for Switch to Consult button
+ */
+export function getSwitchToConsultButtonVisibility(isBeingConsulted: boolean, consultCallHeld: boolean): Visibility {
+  const isVisible = !isBeingConsulted && consultCallHeld;
+  // const isConferenceWithConsultNotHeld = isConferenceInProgress && isConsultAccepted && !consultCallHeld;
+  const isEnabled = true;
+
+  return {isVisible, isEnabled};
+}
+
+// ==================== OTHER FUNCTIONS ====================
+
+/**
+ * Get visibility for Wrapup button
+ */
+export function getWrapupButtonVisibility(task: ITask): Visibility {
+  const isVisible = task?.data?.wrapUpRequired ?? false;
+
+  return {isVisible, isEnabled: true};
+}
+// ==================== MAIN AGGREGATOR FUNCTION ====================
 
 /**
  * This function determines the visibility of various controls based on the task's data.
+ * @param deviceType The device type (Browser, Extension, AgentDN)
+ * @param featureFlags Feature flags configuration object
  * @param task The task object
- * @returns An object containing the visibility of various controls based on the task's data
+ * @param agentId The agent ID
+ * @param multiPartyConferenceEnabled Whether multiparty conference is enabled
+ * @param logger Optional logger instance
+ * @returns An object containing the visibility and state of various controls
  */
 export function getControlsVisibility(
   deviceType: string,
   featureFlags: {[key: string]: boolean},
   task: ITask,
+  agentId: string,
+  multiPartyConferenceEnabled: boolean,
   logger?: ILogger
 ) {
   try {
+    // Extract media type and related flags
     const {mediaType} = task?.data?.interaction || {};
+    const isCall = mediaType === MEDIA_TYPE_TELEPHONY;
+    const isChat = mediaType === MEDIA_TYPE_CHAT;
+    const isEmail = mediaType === MEDIA_TYPE_EMAIL;
+    const isDigitalChannel = isChat || isEmail;
 
-    const isCall = mediaType === 'telephony';
-    const isChat = mediaType === 'chat';
-    const isEmail = mediaType === 'email';
-
-    const isBrowser = deviceType === 'BROWSER';
-    const isAgentDN = deviceType === 'AGENT_DN';
-    const isExtension = deviceType === 'EXTENSION';
+    // Extract device type flags
+    const {isBrowser, isAgentDN, isExtension} = getDeviceTypeFlags(deviceType);
+    const isPhoneDevice = isAgentDN || isExtension;
 
+    // Extract feature flags
     const {isEndCallEnabled, isEndConsultEnabled, webRtcEnabled} = featureFlags;
 
+    // Calculate telephony support
+    const telephonySupported = isTelephonySupported(deviceType, webRtcEnabled);
+
+    // Calculate task state flags
+    const isTransferVisibility = isBrowser ? webRtcEnabled : true;
+    const isConferenceInProgress = task?.data?.isConferenceInProgress ?? false;
+    const isConsultInProgress = getIsConsultInProgress(task);
+    const isHeld = findHoldStatus(task, 'mainCall', agentId);
+    const isCustomerInCall = getIsCustomerInCall(task);
+    // const mainCallHeld = findHoldStatus(task, 'mainCall', agentId);
+    const consultCallHeld = findHoldStatus(task, 'consult', agentId);
+    const taskConsultStatus = getConsultStatus(task, agentId);
+
+    // Calculate conference participants count
+    const conferenceParticipantsCount = getConferenceParticipantsCount(task);
+    const maxParticipantsInConference = multiPartyConferenceEnabled
+      ? MAX_PARTICIPANTS_IN_MULTIPARTY_CONFERENCE
+      : MAX_PARTICIPANTS_IN_THREE_PARTY_CONFERENCE;
+
+    // Calculate consult status flags (REUSED CONDITIONS)
+    const isConsultInitiated = taskConsultStatus === ConsultStatus.CONSULT_INITIATED;
+    const isConsultAccepted = taskConsultStatus === ConsultStatus.CONSULT_ACCEPTED;
+    const isBeingConsulted = taskConsultStatus === ConsultStatus.BEING_CONSULTED_ACCEPTED;
+    const isConsultCompleted = taskConsultStatus === ConsultStatus.CONSULT_COMPLETED;
+    const isConsultInitiatedOrAccepted = isConsultInitiated || isConsultAccepted || isBeingConsulted;
+    const isConsultInitiatedOrAcceptedOnly = isConsultInitiated || isConsultAccepted;
+    const isConsultInitiatedOrAcceptedOrBeingConsulted =
+      isConsultInitiated ||
+      isConsultAccepted ||
+      taskConsultStatus === ConsultStatus.BEING_CONSULTED ||
+      isBeingConsulted;
+
+    // Build controls visibility object
     const controls = {
-      accept:
-        (isBrowser && ((webRtcEnabled && isCall) || isChat || isEmail)) ||
-        (isAgentDN && (isChat || isEmail)) ||
-        (isExtension && (isChat || isEmail)),
-      decline: isBrowser && webRtcEnabled && isCall,
-      end: isBrowser || (isEndCallEnabled && isCall) || !isCall,
-      muteUnmute: isBrowser && webRtcEnabled && isCall,
-
-      holdResume: isCall && ((isBrowser && webRtcEnabled) || isAgentDN || isExtension), // Applicable for all type of station login
-      consult: isCall && ((isBrowser && webRtcEnabled) || isAgentDN || isExtension), // Applicable for all type of station login
-      transfer: isBrowser ? webRtcEnabled : true, // Applicable for all type of station login and media type
-
-      conference: (isBrowser && isCall && webRtcEnabled) || isChat, // This needs further testing after we add support
-      wrapup: task?.data?.wrapUpRequired ?? false, // Applicable for all type of station login and media type and getting actual value from task data
-      pauseResumeRecording: isCall && ((isBrowser && webRtcEnabled) || isAgentDN || isExtension), // Getting feature flag (isRecordingManagementEnabled) value as undefined, need further testing
-      endConsult: isEndConsultEnabled && isCall && ((isBrowser && webRtcEnabled) || isAgentDN || isExtension),
-      recordingIndicator: isCall,
+      // Basic call controls
+      accept: getAcceptButtonVisibility(isBrowser, isPhoneDevice, webRtcEnabled, isCall, isDigitalChannel),
+      decline: getDeclineButtonVisibility(isBrowser, webRtcEnabled, isCall),
+      end: getEndButtonVisibility(
+        isBrowser,
+        isEndCallEnabled,
+        isCall,
+        isConsultInitiatedOrAcceptedOrBeingConsulted,
+        isConferenceInProgress,
+        isConsultCompleted,
+        isHeld
+      ),
+      muteUnmute: getMuteUnmuteButtonVisibility(isBrowser, webRtcEnabled, isCall, isBeingConsulted),
+      holdResume: getHoldResumeButtonVisibility(
+        telephonySupported,
+        isCall,
+        isConferenceInProgress,
+        isConsultInProgress,
+        isHeld,
+        isBeingConsulted,
+        isConsultCompleted
+      ),
+
+      // Recording controls
+      pauseResumeRecording: getPauseResumeRecordingButtonVisibility(
+        telephonySupported,
+        isCall,
+        isConferenceInProgress,
+        isConsultInitiatedOrAccepted
+      ),
+      recordingIndicator: getRecordingIndicatorVisibility(isCall),
+
+      // Transfer and conference controls
+      transfer: getTransferButtonVisibility(isTransferVisibility, isConferenceInProgress, isConsultInitiatedOrAccepted),
+      conference: getConferenceButtonVisibility(isBrowser, webRtcEnabled, isCall, isChat, isBeingConsulted),
+      exitConference: getExitConferenceButtonVisibility(
+        isConferenceInProgress,
+        isConsultInitiatedOrAccepted,
+        consultCallHeld,
+        isHeld,
+        isConsultCompleted
+      ),
+      mergeConference: getMergeConferenceButtonVisibility(
+        isConsultInitiatedOrAcceptedOnly,
+        isConsultAccepted,
+        consultCallHeld,
+        isConferenceInProgress,
+        isCustomerInCall
+      ),
+
+      // Consult controls
+      consult: getConsultButtonVisibility(
+        telephonySupported,
+        isCall,
+        isConsultInProgress,
+        isCustomerInCall,
+        conferenceParticipantsCount,
+        maxParticipantsInConference,
+        isBeingConsulted,
+        isHeld,
+        isConsultCompleted,
+        isConferenceInProgress
+      ),
+      endConsult: getEndConsultButtonVisibility(
+        isEndConsultEnabled,
+        telephonySupported,
+        isCall,
+        isConsultInitiatedOrAccepted
+      ),
+      consultTransfer: getConsultTransferButtonVisibility(
+        isConsultInitiatedOrAcceptedOnly,
+        isConsultAccepted,
+        consultCallHeld,
+        isConferenceInProgress,
+        isCustomerInCall
+      ),
+      consultTransferConsult: getConsultTransferConsultButtonVisibility(
+        isConsultAccepted,
+        isConsultInitiated,
+        consultCallHeld,
+        isCustomerInCall
+      ),
+      mergeConferenceConsult: getMergeConferenceConsultButtonVisibility(
+        isConsultAccepted,
+        isConsultInitiated,
+        consultCallHeld,
+        isCustomerInCall
+      ),
+      muteUnmuteConsult: getMuteUnmuteConsultButtonVisibility(
+        isBrowser,
+        webRtcEnabled,
+        isCall,
+        isConsultInitiated,
+        isBeingConsulted
+      ),
+
+      // Switch call controls
+      switchToMainCall: getSwitchToMainCallButtonVisibility(
+        isBeingConsulted,
+        isConsultAccepted,
+        isConsultInitiated,
+        consultCallHeld,
+        isCustomerInCall,
+        isConferenceInProgress
+      ),
+      switchToConsult: getSwitchToConsultButtonVisibility(isBeingConsulted, consultCallHeld),
+
+      // Other controls
+      wrapup: getWrapupButtonVisibility(task),
+
+      // State flags
+      isConferenceInProgress: getConferenceInProgressVisibility(task),
+      isConsultInitiated,
+      isConsultInitiatedAndAccepted: isConsultAccepted,
+      isConsultReceived: isBeingConsulted,
+      isConsultInitiatedOrAccepted: isConsultInitiatedOrAccepted,
+      isHeld,
+      consultCallHeld,
     };
 
     return controls;
@@ -51,39 +564,37 @@ export function getControlsVisibility(
       module: 'task-util',
       method: 'getControlsVisibility',
     });
+
     // Return safe default controls
+    const defaultVisibility: Visibility = {isVisible: false, isEnabled: false};
     return {
-      accept: false,
-      decline: false,
-      end: false,
-      muteUnmute: false,
-      holdResume: false,
-      consult: false,
-      transfer: false,
-      conference: false,
-      wrapup: false,
-      pauseResumeRecording: false,
-      endConsult: false,
-      recordingIndicator: false,
+      accept: defaultVisibility,
+      decline: defaultVisibility,
+      end: defaultVisibility,
+      muteUnmute: defaultVisibility,
+      holdResume: defaultVisibility,
+      pauseResumeRecording: defaultVisibility,
+      recordingIndicator: defaultVisibility,
+      transfer: defaultVisibility,
+      conference: defaultVisibility,
+      exitConference: defaultVisibility,
+      mergeConference: defaultVisibility,
+      consult: defaultVisibility,
+      endConsult: defaultVisibility,
+      consultTransfer: defaultVisibility,
+      consultTransferConsult: defaultVisibility,
+      mergeConferenceConsult: defaultVisibility,
+      muteUnmuteConsult: defaultVisibility,
+      switchToMainCall: defaultVisibility,
+      switchToConsult: defaultVisibility,
+      wrapup: {isVisible: false, isEnabled: true},
+      isConferenceInProgress: false,
+      isConsultInitiated: false,
+      isConsultInitiatedAndAccepted: false,
+      isConsultReceived: false,
+      isConsultInitiatedOrAccepted: false,
+      isHeld: false,
+      consultCallHeld: false,
     };
   }
 }
-
-//@ts-expect-error  To be fixed in SDK - https://jira-eng-sjc12.cisco.com/jira/browse/CAI-6762
-export function findHoldTimestamp(interaction: Interaction, mType = 'mainCall', logger?: ILogger): number | null {
-  try {
-    if (!interaction?.media) return null;
-    for (const key in interaction.media) {
-      if (interaction.media[key].mType === mType) {
-        return interaction.media[key].holdTimestamp ?? null;
-      }
-    }
-    return null;
-  } catch (error) {
-    logger?.error(`CC-Widgets: Task: Error in findHoldTimestamp - ${error.message}`, {
-      module: 'task-util',
-      method: 'findHoldTimestamp',
-    });
-    return null;
-  }
-}
diff --git a/packages/contact-center/task/src/helper.ts b/packages/contact-center/task/src/helper.ts
index c8f719b51..5f8b8827d 100644
--- a/packages/contact-center/task/src/helper.ts
+++ b/packages/contact-center/task/src/helper.ts
@@ -1,12 +1,14 @@
 import {useEffect, useCallback, useState, useRef, useMemo} from 'react';
 import {ITask} from '@webex/contact-center';
-import {useCallControlProps, UseTaskListProps, UseTaskProps, Participant, useOutdialCallProps} from './task.types';
+import {useCallControlProps, UseTaskListProps, UseTaskProps, useOutdialCallProps} from './task.types';
 import store, {
   TASK_EVENTS,
   BuddyDetails,
   DestinationType,
-  ContactServiceQueue,
   PaginatedListParams,
+  getConferenceParticipants,
+  Participant,
+  findMediaResourceId,
 } from '@webex/cc-store';
 import {findHoldTimestamp, getControlsVisibility} from './Utils/task-util';
 import {OutdialAniEntriesResponse} from '@webex/contact-center/dist/types/services/config/types';
@@ -275,22 +277,21 @@ export const useCallControl = (props: useCallControlProps) => {
     onRecordingToggle,
     onToggleMute,
     logger,
-    consultInitiated,
     deviceType,
     featureFlags,
     isMuted,
+    multiPartyConferenceEnabled,
+    agentId,
   } = props;
-  const [isHeld, setIsHeld] = useState<boolean | undefined>(undefined);
   const [isRecording, setIsRecording] = useState(true);
   const [buddyAgents, setBuddyAgents] = useState<BuddyDetails[]>([]);
-  const [queues, setQueues] = useState<ContactServiceQueue[]>([]);
   const [consultAgentName, setConsultAgentName] = useState<string>('Consult Agent');
-  const [consultAgentId, setConsultAgentId] = useState<string>(null);
   const [holdTime, setHoldTime] = useState(0);
   const [startTimestamp, setStartTimestamp] = useState<number>(0);
   const [secondsUntilAutoWrapup, setsecondsUntilAutoWrapup] = useState<number | null>(null);
   const workerRef = useRef<Worker | null>(null);
   const [lastTargetType, setLastTargetType] = useState<'agent' | 'queue'>('agent');
+  const [conferenceParticipants, setConferenceParticipants] = useState<Participant[]>([]);
 
   const workerScript = `
     let intervalId = null;
@@ -324,7 +325,7 @@ export const useCallControl = (props: useCallControlProps) => {
 
     // Get holdTimestamp from the interaction object
     const holdTimestamp = currentTask?.data?.interaction
-      ? findHoldTimestamp(currentTask.data.interaction, 'mainCall', logger)
+      ? findHoldTimestamp(currentTask.data.interaction, 'mainCall')
       : null;
 
     if (holdTimestamp) {
@@ -354,7 +355,14 @@ export const useCallControl = (props: useCallControlProps) => {
         workerRef.current = null;
       }
     };
-  }, [currentTask?.data?.interaction]);
+  }, [currentTask]);
+
+  useEffect(() => {
+    if (currentTask && store?.cc?.agentConfig?.agentId) {
+      const participants = getConferenceParticipants(currentTask, store.cc.agentConfig.agentId);
+      setConferenceParticipants(participants);
+    }
+  }, [currentTask]);
   // Function to extract consulting agent information
   const extractConsultingAgent = useCallback(() => {
     try {
@@ -374,7 +382,6 @@ export const useCallControl = (props: useCallControlProps) => {
 
       if (foundAgent) {
         setConsultAgentName(foundAgent.name);
-        setConsultAgentId(foundAgent.id);
         logger.info(`Consulting agent detected: ${foundAgent.name} ${foundAgent.id}`, {
           module: 'widget-cc-task#helper.ts',
           method: 'useCallControl#extractConsultingAgent',
@@ -387,7 +394,7 @@ export const useCallControl = (props: useCallControlProps) => {
         method: 'extractConsultingAgent',
       });
     }
-  }, [currentTask, logger, consultInitiated]);
+  }, [currentTask, logger]);
 
   // Check for consulting agent whenever currentTask changes
   useEffect(() => {
@@ -399,7 +406,7 @@ export const useCallControl = (props: useCallControlProps) => {
     ) {
       setStartTimestamp(currentTask.data.interaction.participants[store.cc.agentConfig.agentId].joinTimestamp);
     }
-  }, [currentTask, extractConsultingAgent, consultInitiated]);
+  }, [currentTask, extractConsultingAgent]);
 
   const loadBuddyAgents = useCallback(async () => {
     try {
@@ -415,19 +422,6 @@ export const useCallControl = (props: useCallControlProps) => {
     }
   }, [logger]);
 
-  const loadQueues = useCallback(async () => {
-    try {
-      const {data} = await store.getQueues();
-      setQueues(data);
-    } catch (error) {
-      logger?.error(`CC-Widgets: Task: Error loading queues - ${error.message || error}`, {
-        module: 'useCallControl',
-        method: 'loadQueues',
-      });
-      setQueues([]);
-    }
-  }, [logger]);
-
   const getAddressBookEntries = useCallback(
     async ({page, pageSize, search}: PaginatedListParams) => {
       try {
@@ -476,7 +470,6 @@ export const useCallControl = (props: useCallControlProps) => {
 
   const holdCallback = () => {
     try {
-      setIsHeld(true);
       if (onHoldResume) {
         onHoldResume({
           isHeld: true,
@@ -493,7 +486,6 @@ export const useCallControl = (props: useCallControlProps) => {
 
   const resumeCallback = () => {
     try {
-      setIsHeld(false);
       if (onHoldResume) {
         onHoldResume({
           isHeld: false,
@@ -571,39 +563,33 @@ export const useCallControl = (props: useCallControlProps) => {
   };
 
   useEffect(() => {
-    if (!currentTask) return;
+    if (!currentTask?.data?.interactionId) return;
     logger.log(`useCallControl init for task ${currentTask.data.interactionId}`, {
       module: 'useCallControl',
       method: 'useEffect-init',
     });
 
+    const interactionId = currentTask.data.interactionId;
+
     store.setTaskCallback(
       // Should use holdCallback
       TASK_EVENTS.TASK_HOLD,
       holdCallback,
-      currentTask.data.interactionId
+      interactionId
     );
-    store.setTaskCallback(TASK_EVENTS.TASK_RESUME, resumeCallback, currentTask.data.interactionId);
-    store.setTaskCallback(TASK_EVENTS.TASK_END, endCallCallback, currentTask.data.interactionId);
-    store.setTaskCallback(TASK_EVENTS.AGENT_WRAPPEDUP, wrapupCallCallback, currentTask.data.interactionId);
-    store.setTaskCallback(TASK_EVENTS.TASK_RECORDING_PAUSED, pauseRecordingCallback, currentTask.data.interactionId);
-    store.setTaskCallback(TASK_EVENTS.TASK_RECORDING_RESUMED, resumeRecordingCallback, currentTask.data.interactionId);
+    store.setTaskCallback(TASK_EVENTS.TASK_RESUME, resumeCallback, interactionId);
+    store.setTaskCallback(TASK_EVENTS.TASK_END, endCallCallback, interactionId);
+    store.setTaskCallback(TASK_EVENTS.AGENT_WRAPPEDUP, wrapupCallCallback, interactionId);
+    store.setTaskCallback(TASK_EVENTS.TASK_RECORDING_PAUSED, pauseRecordingCallback, interactionId);
+    store.setTaskCallback(TASK_EVENTS.TASK_RECORDING_RESUMED, resumeRecordingCallback, interactionId);
 
     return () => {
-      store.removeTaskCallback(TASK_EVENTS.TASK_HOLD, holdCallback, currentTask.data.interactionId);
-      store.removeTaskCallback(TASK_EVENTS.TASK_RESUME, resumeCallback, currentTask.data.interactionId);
-      store.removeTaskCallback(TASK_EVENTS.TASK_END, endCallCallback, currentTask.data.interactionId);
-      store.removeTaskCallback(TASK_EVENTS.AGENT_WRAPPEDUP, wrapupCallCallback, currentTask.data.interactionId);
-      store.removeTaskCallback(
-        TASK_EVENTS.CONTACT_RECORDING_PAUSED,
-        pauseRecordingCallback,
-        currentTask.data.interactionId
-      );
-      store.removeTaskCallback(
-        TASK_EVENTS.CONTACT_RECORDING_RESUMED,
-        resumeRecordingCallback,
-        currentTask.data.interactionId
-      );
+      store.removeTaskCallback(TASK_EVENTS.TASK_HOLD, holdCallback, interactionId);
+      store.removeTaskCallback(TASK_EVENTS.TASK_RESUME, resumeCallback, interactionId);
+      store.removeTaskCallback(TASK_EVENTS.TASK_END, endCallCallback, interactionId);
+      store.removeTaskCallback(TASK_EVENTS.AGENT_WRAPPEDUP, wrapupCallCallback, interactionId);
+      store.removeTaskCallback(TASK_EVENTS.CONTACT_RECORDING_PAUSED, pauseRecordingCallback, interactionId);
+      store.removeTaskCallback(TASK_EVENTS.CONTACT_RECORDING_RESUMED, resumeRecordingCallback, interactionId);
     };
   }, [currentTask]);
 
@@ -667,7 +653,6 @@ export const useCallControl = (props: useCallControlProps) => {
       const intendedMuteState = !isMuted;
 
       try {
-        //@ts-expect-error  To be fixed in SDK - https://jira-eng-sjc12.cisco.com/jira/browse/CAI-6762
         await currentTask.toggleMute();
 
         // Only update state after successful SDK call
@@ -740,7 +725,6 @@ export const useCallControl = (props: useCallControlProps) => {
 
   const transferCall = async (to: string, type: DestinationType) => {
     try {
-      //@ts-expect-error  To be fixed in SDK - https://jira-eng-sjc12.cisco.com/jira/browse/CAI-6762
       await currentTask.transfer({to, destinationType: type});
       logger.info('transferCall success', {module: 'useCallControl', method: 'transferCall'});
     } catch (error) {
@@ -749,32 +733,75 @@ export const useCallControl = (props: useCallControlProps) => {
     }
   };
 
-  const consultCall = async (consultDestination: string, destinationType: DestinationType) => {
+  const consultConference = async () => {
+    try {
+      await currentTask.consultConference();
+      logger.info('consultConference success', {
+        module: 'useCallControl',
+        method: 'consultConference',
+      });
+    } catch (error) {
+      logger.error(`Error consulting conference: ${error}`, {module: 'useCallControl', method: 'consultConference'});
+      throw error;
+    }
+  };
+
+  const switchToMainCall = async () => {
+    try {
+      await currentTask.resume(findMediaResourceId(currentTask, 'consult'));
+      logger.info('switchToMainCall success', {module: 'useCallControl', method: 'switchToMainCall'});
+    } catch (error) {
+      logger.error(`Error switchToMainCall: ${error}`, {module: 'useCallControl', method: 'switchToMainCall'});
+      throw error;
+    }
+  };
+
+  const switchToConsult = async () => {
+    try {
+      await currentTask.hold(findMediaResourceId(currentTask, 'mainCall'));
+      logger.info('switchToConsult success', {module: 'useCallControl', method: 'switchToConsult'});
+    } catch (error) {
+      logger.error(`Error switching to consult: ${error}`, {module: 'useCallControl', method: 'switchToConsult'});
+      throw error;
+    }
+  };
+
+  const exitConference = async () => {
+    try {
+      await currentTask.exitConference();
+      logger.info('exitConference success', {module: 'useCallControl', method: 'exitConference'});
+    } catch (error) {
+      logger.error(`Error exiting conference: ${error}`, {module: 'useCallControl', method: 'exitConference'});
+      throw error;
+    }
+  };
+
+  const consultCall = async (
+    consultDestination: string,
+    destinationType: DestinationType,
+    allowParticipantsToInteract: boolean
+  ) => {
     const consultPayload = {
       to: consultDestination,
       destinationType: destinationType,
+      holdParticipants: !allowParticipantsToInteract,
     };
 
     if (destinationType === 'queue') {
       store.setIsQueueConsultInProgress(true);
       store.setCurrentConsultQueueId(consultDestination);
-      store.setConsultInitiated(true);
     }
 
     try {
-      //@ts-expect-error  To be fixed in SDK - https://jira-eng-sjc12.cisco.com/jira/browse/CAI-6762
       await currentTask.consult(consultPayload);
       store.setIsQueueConsultInProgress(false);
       if (destinationType === 'queue') {
         store.setCurrentConsultQueueId(null);
-      } else {
-        store.setConsultInitiated(true);
       }
     } catch (error) {
       if (destinationType === 'queue') {
         store.setIsQueueConsultInProgress(false);
         store.setCurrentConsultQueueId(null);
-        store.setConsultInitiated(false);
       }
       logError(`Error consulting call: ${error}`, 'consultCall');
       throw error;
@@ -782,6 +809,11 @@ export const useCallControl = (props: useCallControlProps) => {
   };
 
   const endConsultCall = async () => {
+    if (!currentTask?.data?.interactionId) {
+      logError('Cannot end consult call: currentTask or interactionId is missing', 'endConsultCall');
+      return;
+    }
+
     const consultEndPayload = {
       isConsult: true,
       taskId: currentTask.data.interactionId,
@@ -789,7 +821,6 @@ export const useCallControl = (props: useCallControlProps) => {
     };
 
     try {
-      //@ts-expect-error  To be fixed in SDK - https://jira-eng-sjc12.cisco.com/jira/browse/CAI-6762
       await currentTask.endConsult(consultEndPayload);
     } catch (error) {
       logError(`Error ending consult call: ${error}`, 'endConsultCall');
@@ -798,10 +829,22 @@ export const useCallControl = (props: useCallControlProps) => {
   };
 
   const consultTransfer = async () => {
+    if (!currentTask?.data) {
+      logError('Cannot transfer consult call: currentTask or data is missing', 'consultTransfer');
+      return;
+    }
+
     try {
-      //@ts-expect-error  To be fixed in SDK - https://jira-eng-sjc12.cisco.com/jira/browse/CAI-6762
-      await currentTask.consultTransfer();
-      store.setConsultInitiated(true);
+      if (currentTask.data.isConferenceInProgress) {
+        logger.info('Conference in progress, using transferConference', {
+          module: 'useCallControl',
+          method: 'transferCall',
+        });
+        await currentTask.transferConference();
+      } else {
+        logger.info('Consult transfer initiated', {module: 'useCallControl', method: 'consultTransfer'});
+        await currentTask.consultTransfer();
+      }
     } catch (error) {
       logError(`Error transferring consult call: ${error}`, 'consultTransfer');
       throw error;
@@ -809,6 +852,14 @@ export const useCallControl = (props: useCallControlProps) => {
   };
 
   const cancelAutoWrapup = () => {
+    if (!currentTask) {
+      logger.warn('CC-Widgets: CallControl: Cannot cancel auto-wrapup, currentTask is missing', {
+        module: 'widget-cc-task#helper.ts',
+        method: 'useCallControl#cancelAutoWrapup',
+      });
+      return;
+    }
+
     logger.info('CC-Widgets: CallControl: wrap-up cancelled', {
       module: 'widget-cc-task#helper.ts',
       method: 'useCallControl#cancelAutoWrapup',
@@ -817,8 +868,8 @@ export const useCallControl = (props: useCallControlProps) => {
   };
 
   const controlVisibility = useMemo(
-    () => getControlsVisibility(deviceType, featureFlags, currentTask, logger),
-    [deviceType, featureFlags, currentTask, logger]
+    () => getControlsVisibility(deviceType, featureFlags, currentTask, agentId, multiPartyConferenceEnabled, logger),
+    [deviceType, featureFlags, currentTask, agentId, multiPartyConferenceEnabled, logger]
   );
 
   // Add useEffect for auto wrap-up timer
@@ -865,22 +916,20 @@ export const useCallControl = (props: useCallControlProps) => {
     toggleMute,
     isMuted,
     wrapupCall,
-    isHeld,
-    setIsHeld,
     isRecording,
     setIsRecording,
     buddyAgents,
     loadBuddyAgents,
-    queues,
-    loadQueues,
     transferCall,
     consultCall,
     endConsultCall,
     consultTransfer,
+    consultConference,
+    switchToMainCall,
+    switchToConsult,
+    exitConference,
     consultAgentName,
     setConsultAgentName,
-    consultAgentId,
-    setConsultAgentId,
     holdTime,
     startTimestamp,
     lastTargetType,
@@ -888,6 +937,7 @@ export const useCallControl = (props: useCallControlProps) => {
     controlVisibility,
     secondsUntilAutoWrapup,
     cancelAutoWrapup,
+    conferenceParticipants,
     getAddressBookEntries,
     getEntryPoints,
     getQueuesFetcher,
diff --git a/packages/contact-center/task/src/task.types.ts b/packages/contact-center/task/src/task.types.ts
index 04b79adf7..0cbfb7e67 100644
--- a/packages/contact-center/task/src/task.types.ts
+++ b/packages/contact-center/task/src/task.types.ts
@@ -20,20 +20,24 @@ export type CallControlProps = Partial<
     | 'callControlClassName'
     | 'callControlConsultClassName'
     | 'onToggleMute'
+    | 'multiPartyConferenceEnabled'
     | 'consultTransferOptions'
   >
 >;
 
 export type useCallControlProps = Pick<
   ControlProps,
-  'currentTask' | 'logger' | 'consultInitiated' | 'deviceType' | 'featureFlags' | 'isMuted'
+  'currentTask' | 'logger' | 'deviceType' | 'featureFlags' | 'isMuted' | 'multiPartyConferenceEnabled' | 'agentId'
 > &
   Partial<Pick<ControlProps, 'onHoldResume' | 'onEnd' | 'onWrapUp' | 'onRecordingToggle' | 'onToggleMute'>>;
 
-export type Participant = {
-  id: string;
-  pType: 'Customer' | 'Agent' | string;
-  name?: string;
-};
-
 export type useOutdialCallProps = Pick<OutdialCallProps, 'cc' | 'logger'>;
+
+/**
+ * Helper interface for device type checks
+ */
+export interface DeviceTypeFlags {
+  isBrowser: boolean;
+  isAgentDN: boolean;
+  isExtension: boolean;
+}
diff --git a/packages/contact-center/task/tests/CallControl/index.tsx b/packages/contact-center/task/tests/CallControl/index.tsx
index 03678a22e..1328bbaae 100644
--- a/packages/contact-center/task/tests/CallControl/index.tsx
+++ b/packages/contact-center/task/tests/CallControl/index.tsx
@@ -11,6 +11,11 @@ const onEndCb = jest.fn();
 const onWrapUpCb = jest.fn();
 const onRecordingToggleCb = jest.fn();
 
+const defaultVisibility = {
+  isVisible: false,
+  isEnabled: false,
+};
+
 describe('CallControl Component', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -29,44 +34,58 @@ describe('CallControl Component', () => {
       toggleHold: jest.fn(),
       toggleRecording: jest.fn(),
       wrapupCall: jest.fn(),
-      isHeld: false,
       isRecording: false,
-      setIsHeld: jest.fn(),
       setIsRecording: jest.fn(),
       buddyAgents: [],
       loadBuddyAgents: jest.fn(),
-      queues: [],
-      loadQueues: jest.fn(),
       transferCall: jest.fn(),
       consultCall: jest.fn(),
       endConsultCall: jest.fn(),
       consultTransfer: jest.fn(),
       consultAgentName: 'Consult Agent',
       setConsultAgentName: jest.fn(),
-      consultAgentId: 'mockConsultAgentId',
-      setConsultAgentId: jest.fn(),
       holdTime: 0,
       startTimestamp: 0,
       lastTargetType: 'agent' as const,
       setLastTargetType: jest.fn(),
       controlVisibility: {
-        accept: false,
-        decline: false,
-        end: false,
-        muteUnmute: false,
-        holdResume: true,
-        consult: false,
-        transfer: false,
-        conference: false,
-        wrapup: false,
-        pauseResumeRecording: false,
-        endConsult: false,
-        recordingIndicator: false,
+        accept: defaultVisibility,
+        decline: defaultVisibility,
+        end: defaultVisibility,
+        muteUnmute: defaultVisibility,
+        muteUnmuteConsult: defaultVisibility,
+        holdResume: defaultVisibility,
+        consult: defaultVisibility,
+        transfer: defaultVisibility,
+        conference: defaultVisibility,
+        wrapup: defaultVisibility,
+        pauseResumeRecording: defaultVisibility,
+        endConsult: defaultVisibility,
+        consultTransfer: defaultVisibility,
+        mergeConference: defaultVisibility,
+        mergeConferenceConsult: defaultVisibility,
+        consultTransferConsult: defaultVisibility,
+        switchToMainCall: defaultVisibility,
+        switchToConsult: defaultVisibility,
+        exitConference: defaultVisibility,
+        recordingIndicator: defaultVisibility,
+        isConferenceInProgress: false,
+        isConsultInitiated: false,
+        isConsultInitiatedAndAccepted: false,
+        isConsultInitiatedOrAccepted: false,
+        isConsultReceived: false,
+        isHeld: false,
+        consultCallHeld: false,
       },
+      switchToMainCall: jest.fn(),
+      switchToConsult: jest.fn(),
       secondsUntilAutoWrapup: 0,
       cancelAutoWrapup: jest.fn(),
       toggleMute: jest.fn(),
       isMuted: false,
+      consultConference: jest.fn(),
+      exitConference: jest.fn(),
+      conferenceParticipants: [],
       getAddressBookEntries: jest.fn().mockResolvedValue({data: [], meta: {page: 0, totalPages: 0}}),
       getEntryPoints: jest.fn().mockResolvedValue({data: [], meta: {page: 0, totalPages: 0}}),
       getQueuesFetcher: jest.fn().mockResolvedValue({data: [], meta: {page: 0, totalPages: 0}}),
@@ -85,15 +104,16 @@ describe('CallControl Component', () => {
     expect(useCallControlSpy).toHaveBeenCalledWith({
       currentTask: null,
       onHoldResume: onHoldResumeCb,
+      multiPartyConferenceEnabled: true,
       onEnd: onEndCb,
       onWrapUp: onWrapUpCb,
       onRecordingToggle: onRecordingToggleCb,
       logger: store.logger,
-      consultInitiated: false,
       featureFlags: store.featureFlags,
       deviceType: '',
       isMuted: false,
       onToggleMute: undefined,
+      agentId: store.agentId,
     });
   });
 
@@ -120,5 +140,19 @@ describe('CallControl Component', () => {
       expect(container.firstChild).toBeNull();
       expect(mockOnErrorCallback).toHaveBeenCalledWith('CallControl', Error('Test error in useCallControl'));
     });
+
+    it('should not throw when onErrorCallback is not set', () => {
+      store.onErrorCallback = undefined;
+
+      // Mock the useCallControl to throw an error
+      jest.spyOn(helper, 'useCallControl').mockImplementation(() => {
+        throw new Error('Test error in useCallControl');
+      });
+
+      const {container} = render(<CallControl onHoldResume={onHoldResumeCb} onEnd={onEndCb} onWrapUp={onWrapUpCb} />);
+
+      // The fallback should still render an empty fragment
+      expect(container.firstChild).toBeNull();
+    });
   });
 });
diff --git a/packages/contact-center/task/tests/CallControlCAD/index.tsx b/packages/contact-center/task/tests/CallControlCAD/index.tsx
new file mode 100644
index 000000000..dafb095c1
--- /dev/null
+++ b/packages/contact-center/task/tests/CallControlCAD/index.tsx
@@ -0,0 +1,394 @@
+import React from 'react';
+import {render} from '@testing-library/react';
+import * as helper from '../../src/helper';
+import {CallControlCAD} from '../../src';
+import store from '@webex/cc-store';
+import {mockTask} from '@webex/test-fixtures';
+import '@testing-library/jest-dom';
+
+const onHoldResumeCb = jest.fn();
+const onEndCb = jest.fn();
+const onWrapUpCb = jest.fn();
+const onRecordingToggleCb = jest.fn();
+const onToggleMuteCb = jest.fn();
+
+describe('CallControlCAD Component', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    // Suppress console.error for error boundary tests
+    jest.spyOn(console, 'error').mockImplementation(() => {});
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it('renders CallControlCADComponent with correct props', () => {
+    const useCallControlSpy = jest.spyOn(helper, 'useCallControl').mockReturnValue({
+      currentTask: mockTask,
+      endCall: jest.fn(),
+      toggleHold: jest.fn(),
+      toggleRecording: jest.fn(),
+      wrapupCall: jest.fn(),
+      isRecording: false,
+      setIsRecording: jest.fn(),
+      buddyAgents: [],
+      loadBuddyAgents: jest.fn(),
+      transferCall: jest.fn(),
+      consultCall: jest.fn(),
+      endConsultCall: jest.fn(),
+      consultTransfer: jest.fn(),
+      consultAgentName: 'Consult Agent',
+      setConsultAgentName: jest.fn(),
+      holdTime: 0,
+      startTimestamp: 0,
+      lastTargetType: 'agent' as const,
+      setLastTargetType: jest.fn(),
+      controlVisibility: {
+        accept: {isVisible: false, isEnabled: false},
+        decline: {isVisible: false, isEnabled: false},
+        end: {isVisible: false, isEnabled: false},
+        muteUnmute: {isVisible: false, isEnabled: false},
+        muteUnmuteConsult: {isVisible: false, isEnabled: false},
+        holdResume: {isVisible: true, isEnabled: true},
+        consult: {isVisible: false, isEnabled: false},
+        transfer: {isVisible: false, isEnabled: false},
+        conference: {isVisible: false, isEnabled: false},
+        wrapup: {isVisible: false, isEnabled: false},
+        pauseResumeRecording: {isVisible: false, isEnabled: false},
+        endConsult: {isVisible: false, isEnabled: false},
+        consultTransfer: {isVisible: false, isEnabled: false},
+        mergeConference: {isVisible: false, isEnabled: false},
+        mergeConferenceConsult: {isVisible: false, isEnabled: false},
+        consultTransferConsult: {isVisible: false, isEnabled: false},
+        switchToMainCall: {isVisible: false, isEnabled: false},
+        switchToConsult: {isVisible: false, isEnabled: false},
+        exitConference: {isVisible: false, isEnabled: false},
+        recordingIndicator: {isVisible: false, isEnabled: false},
+        isConferenceInProgress: false,
+        isConsultInitiated: false,
+        isConsultInitiatedAndAccepted: false,
+        isConsultInitiatedOrAccepted: false,
+        isConsultReceived: false,
+        isHeld: false,
+        consultCallHeld: false,
+      },
+      switchToMainCall: jest.fn(),
+      switchToConsult: jest.fn(),
+      secondsUntilAutoWrapup: 0,
+      cancelAutoWrapup: jest.fn(),
+      toggleMute: jest.fn(),
+      isMuted: false,
+      consultConference: jest.fn(),
+      exitConference: jest.fn(),
+      conferenceParticipants: [],
+      getAddressBookEntries: jest.fn(),
+      getEntryPoints: jest.fn(),
+      getQueuesFetcher: jest.fn(),
+    });
+
+    render(
+      <CallControlCAD
+        onHoldResume={onHoldResumeCb}
+        onEnd={onEndCb}
+        onWrapUp={onWrapUpCb}
+        onRecordingToggle={onRecordingToggleCb}
+        onToggleMute={onToggleMuteCb}
+        callControlClassName="test-class"
+        callControlConsultClassName="test-consult-class"
+      />
+    );
+
+    // Assert that the useCallControl hook is called with the correct arguments
+    expect(useCallControlSpy).toHaveBeenCalledWith({
+      currentTask: null,
+      onHoldResume: onHoldResumeCb,
+      onEnd: onEndCb,
+      onWrapUp: onWrapUpCb,
+      onRecordingToggle: onRecordingToggleCb,
+      onToggleMute: onToggleMuteCb,
+      logger: store.logger,
+      featureFlags: store.featureFlags,
+      deviceType: '',
+      isMuted: false,
+      multiPartyConferenceEnabled: true,
+      agentId: store.agentId,
+    });
+  });
+
+  it('should use default multiPartyConferenceEnabled value when not provided', () => {
+    const useCallControlSpy = jest.spyOn(helper, 'useCallControl').mockReturnValue({
+      currentTask: mockTask,
+      endCall: jest.fn(),
+      toggleHold: jest.fn(),
+      toggleRecording: jest.fn(),
+      wrapupCall: jest.fn(),
+      isRecording: false,
+      setIsRecording: jest.fn(),
+      buddyAgents: [],
+      loadBuddyAgents: jest.fn(),
+      transferCall: jest.fn(),
+      consultCall: jest.fn(),
+      endConsultCall: jest.fn(),
+      consultTransfer: jest.fn(),
+      consultAgentName: 'Consult Agent',
+      setConsultAgentName: jest.fn(),
+      holdTime: 0,
+      startTimestamp: 0,
+      lastTargetType: 'agent' as const,
+      setLastTargetType: jest.fn(),
+      controlVisibility: {
+        accept: {isVisible: false, isEnabled: false},
+        decline: {isVisible: false, isEnabled: false},
+        end: {isVisible: false, isEnabled: false},
+        muteUnmute: {isVisible: false, isEnabled: false},
+        muteUnmuteConsult: {isVisible: false, isEnabled: false},
+        holdResume: {isVisible: true, isEnabled: true},
+        consult: {isVisible: false, isEnabled: false},
+        transfer: {isVisible: false, isEnabled: false},
+        conference: {isVisible: false, isEnabled: false},
+        wrapup: {isVisible: false, isEnabled: false},
+        pauseResumeRecording: {isVisible: false, isEnabled: false},
+        endConsult: {isVisible: false, isEnabled: false},
+        consultTransfer: {isVisible: false, isEnabled: false},
+        mergeConference: {isVisible: false, isEnabled: false},
+        mergeConferenceConsult: {isVisible: false, isEnabled: false},
+        consultTransferConsult: {isVisible: false, isEnabled: false},
+        switchToMainCall: {isVisible: false, isEnabled: false},
+        switchToConsult: {isVisible: false, isEnabled: false},
+        exitConference: {isVisible: false, isEnabled: false},
+        recordingIndicator: {isVisible: false, isEnabled: false},
+        isConferenceInProgress: false,
+        isConsultInitiated: false,
+        isConsultInitiatedAndAccepted: false,
+        isConsultInitiatedOrAccepted: false,
+        isConsultReceived: false,
+        isHeld: false,
+        consultCallHeld: false,
+      },
+      switchToMainCall: jest.fn(),
+      switchToConsult: jest.fn(),
+      secondsUntilAutoWrapup: 0,
+      cancelAutoWrapup: jest.fn(),
+      toggleMute: jest.fn(),
+      isMuted: false,
+      consultConference: jest.fn(),
+      exitConference: jest.fn(),
+      conferenceParticipants: [],
+      getAddressBookEntries: jest.fn(),
+      getEntryPoints: jest.fn(),
+      getQueuesFetcher: jest.fn(),
+    });
+
+    render(<CallControlCAD onHoldResume={onHoldResumeCb} onEnd={onEndCb} onWrapUp={onWrapUpCb} />);
+
+    // Should default to true when not provided
+    expect(useCallControlSpy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        multiPartyConferenceEnabled: true,
+      })
+    );
+  });
+
+  it('should use provided multiPartyConferenceEnabled value', () => {
+    const useCallControlSpy = jest.spyOn(helper, 'useCallControl').mockReturnValue({
+      currentTask: mockTask,
+      endCall: jest.fn(),
+      toggleHold: jest.fn(),
+      toggleRecording: jest.fn(),
+      wrapupCall: jest.fn(),
+      isRecording: false,
+      setIsRecording: jest.fn(),
+      buddyAgents: [],
+      loadBuddyAgents: jest.fn(),
+      transferCall: jest.fn(),
+      consultCall: jest.fn(),
+      endConsultCall: jest.fn(),
+      consultTransfer: jest.fn(),
+      consultAgentName: 'Consult Agent',
+      setConsultAgentName: jest.fn(),
+      holdTime: 0,
+      startTimestamp: 0,
+      lastTargetType: 'agent' as const,
+      setLastTargetType: jest.fn(),
+      controlVisibility: {
+        accept: {isVisible: false, isEnabled: false},
+        decline: {isVisible: false, isEnabled: false},
+        end: {isVisible: false, isEnabled: false},
+        muteUnmute: {isVisible: false, isEnabled: false},
+        muteUnmuteConsult: {isVisible: false, isEnabled: false},
+        holdResume: {isVisible: true, isEnabled: true},
+        consult: {isVisible: false, isEnabled: false},
+        transfer: {isVisible: false, isEnabled: false},
+        conference: {isVisible: false, isEnabled: false},
+        wrapup: {isVisible: false, isEnabled: false},
+        pauseResumeRecording: {isVisible: false, isEnabled: false},
+        endConsult: {isVisible: false, isEnabled: false},
+        consultTransfer: {isVisible: false, isEnabled: false},
+        mergeConference: {isVisible: false, isEnabled: false},
+        mergeConferenceConsult: {isVisible: false, isEnabled: false},
+        consultTransferConsult: {isVisible: false, isEnabled: false},
+        switchToMainCall: {isVisible: false, isEnabled: false},
+        switchToConsult: {isVisible: false, isEnabled: false},
+        exitConference: {isVisible: false, isEnabled: false},
+        recordingIndicator: {isVisible: false, isEnabled: false},
+        isConferenceInProgress: false,
+        isConsultInitiated: false,
+        isConsultInitiatedAndAccepted: false,
+        isConsultInitiatedOrAccepted: false,
+        isConsultReceived: false,
+        isHeld: false,
+        consultCallHeld: false,
+      },
+      switchToMainCall: jest.fn(),
+      switchToConsult: jest.fn(),
+      secondsUntilAutoWrapup: 0,
+      cancelAutoWrapup: jest.fn(),
+      toggleMute: jest.fn(),
+      isMuted: false,
+      consultConference: jest.fn(),
+      exitConference: jest.fn(),
+      conferenceParticipants: [],
+      getAddressBookEntries: jest.fn(),
+      getEntryPoints: jest.fn(),
+      getQueuesFetcher: jest.fn(),
+    });
+
+    render(
+      <CallControlCAD
+        onHoldResume={onHoldResumeCb}
+        onEnd={onEndCb}
+        onWrapUp={onWrapUpCb}
+        multiPartyConferenceEnabled={false}
+      />
+    );
+
+    // Should use the provided value
+    expect(useCallControlSpy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        multiPartyConferenceEnabled: false,
+      })
+    );
+  });
+
+  it('should pass callControlClassName and callControlConsultClassName to result', () => {
+    jest.spyOn(helper, 'useCallControl').mockReturnValue({
+      currentTask: mockTask,
+      endCall: jest.fn(),
+      toggleHold: jest.fn(),
+      toggleRecording: jest.fn(),
+      wrapupCall: jest.fn(),
+      isRecording: false,
+      setIsRecording: jest.fn(),
+      buddyAgents: [],
+      loadBuddyAgents: jest.fn(),
+      transferCall: jest.fn(),
+      consultCall: jest.fn(),
+      endConsultCall: jest.fn(),
+      consultTransfer: jest.fn(),
+      consultAgentName: 'Consult Agent',
+      setConsultAgentName: jest.fn(),
+      holdTime: 0,
+      startTimestamp: 0,
+      lastTargetType: 'agent' as const,
+      setLastTargetType: jest.fn(),
+      controlVisibility: {
+        accept: {isVisible: false, isEnabled: false},
+        decline: {isVisible: false, isEnabled: false},
+        end: {isVisible: false, isEnabled: false},
+        muteUnmute: {isVisible: false, isEnabled: false},
+        muteUnmuteConsult: {isVisible: false, isEnabled: false},
+        holdResume: {isVisible: true, isEnabled: true},
+        consult: {isVisible: false, isEnabled: false},
+        transfer: {isVisible: false, isEnabled: false},
+        conference: {isVisible: false, isEnabled: false},
+        wrapup: {isVisible: false, isEnabled: false},
+        pauseResumeRecording: {isVisible: false, isEnabled: false},
+        endConsult: {isVisible: false, isEnabled: false},
+        consultTransfer: {isVisible: false, isEnabled: false},
+        mergeConference: {isVisible: false, isEnabled: false},
+        mergeConferenceConsult: {isVisible: false, isEnabled: false},
+        consultTransferConsult: {isVisible: false, isEnabled: false},
+        switchToMainCall: {isVisible: false, isEnabled: false},
+        switchToConsult: {isVisible: false, isEnabled: false},
+        exitConference: {isVisible: false, isEnabled: false},
+        recordingIndicator: {isVisible: false, isEnabled: false},
+        isConferenceInProgress: false,
+        isConsultInitiated: false,
+        isConsultInitiatedAndAccepted: false,
+        isConsultInitiatedOrAccepted: false,
+        isConsultReceived: false,
+        isHeld: false,
+        consultCallHeld: false,
+      },
+      switchToMainCall: jest.fn(),
+      switchToConsult: jest.fn(),
+      secondsUntilAutoWrapup: 0,
+      cancelAutoWrapup: jest.fn(),
+      toggleMute: jest.fn(),
+      isMuted: false,
+      consultConference: jest.fn(),
+      exitConference: jest.fn(),
+      conferenceParticipants: [],
+      getAddressBookEntries: jest.fn(),
+      getEntryPoints: jest.fn(),
+      getQueuesFetcher: jest.fn(),
+    });
+
+    const {container} = render(
+      <CallControlCAD
+        onHoldResume={onHoldResumeCb}
+        onEnd={onEndCb}
+        onWrapUp={onWrapUpCb}
+        callControlClassName="custom-call-control"
+        callControlConsultClassName="custom-consult-class"
+      />
+    );
+
+    // Component should render without errors - the rendering itself validates the classNames are accepted
+    expect(container).toBeDefined();
+    // Verify the component rendered something (even if ErrorBoundary caught an error, container exists)
+    expect(() => container.querySelector('*')).not.toThrow();
+  });
+
+  describe('ErrorBoundary Tests', () => {
+    it('should render empty fragment when ErrorBoundary catches an error', () => {
+      const mockOnErrorCallback = jest.fn();
+      store.onErrorCallback = mockOnErrorCallback;
+
+      // Mock the useCallControl to throw an error
+      jest.spyOn(helper, 'useCallControl').mockImplementation(() => {
+        throw new Error('Test error in useCallControl');
+      });
+
+      const {container} = render(
+        <CallControlCAD
+          onHoldResume={onHoldResumeCb}
+          onEnd={onEndCb}
+          onWrapUp={onWrapUpCb}
+          onRecordingToggle={onRecordingToggleCb}
+        />
+      );
+
+      // The fallback should render an empty fragment (no content)
+      expect(container.firstChild).toBeNull();
+      expect(mockOnErrorCallback).toHaveBeenCalledWith('CallControlCAD', Error('Test error in useCallControl'));
+    });
+
+    it('should not throw when onErrorCallback is not set', () => {
+      store.onErrorCallback = undefined;
+
+      // Mock the useCallControl to throw an error
+      jest.spyOn(helper, 'useCallControl').mockImplementation(() => {
+        throw new Error('Test error in useCallControl');
+      });
+
+      const {container} = render(
+        <CallControlCAD onHoldResume={onHoldResumeCb} onEnd={onEndCb} onWrapUp={onWrapUpCb} />
+      );
+
+      // The fallback should still render an empty fragment
+      expect(container.firstChild).toBeNull();
+    });
+  });
+});
diff --git a/packages/contact-center/task/tests/IncomingTask/index.tsx b/packages/contact-center/task/tests/IncomingTask/index.tsx
index 4658367e7..44f312907 100644
--- a/packages/contact-center/task/tests/IncomingTask/index.tsx
+++ b/packages/contact-center/task/tests/IncomingTask/index.tsx
@@ -49,7 +49,7 @@ describe('IncomingTask Component', () => {
   });
 
   describe('ErrorBoundary Tests', () => {
-    it('should render empty fragment when ErrorBoundary catches an error', () => {
+    it('should render empty fragment when ErrorBoundary catches an error and onErrorCallback is defined', () => {
       jest.spyOn(helper, 'useIncomingTask').mockImplementation(() => {
         throw new Error('Test error in useIncomingTask');
       });
@@ -63,5 +63,18 @@ describe('IncomingTask Component', () => {
       expect(mockOnErrorCallback).toHaveBeenCalledWith('IncomingTask', Error('Test error in useIncomingTask'));
       expect(mockOnErrorCallback).toHaveBeenCalledTimes(1);
     });
+
+    it('should render empty fragment when ErrorBoundary catches an error and onErrorCallback is undefined', () => {
+      jest.spyOn(helper, 'useIncomingTask').mockImplementation(() => {
+        throw new Error('Test error without callback');
+      });
+      store.onErrorCallback = undefined;
+      const {container} = render(
+        <IncomingTask incomingTask={mockTask} onAccepted={onAcceptedCb} onRejected={onRejectedCb} />
+      );
+
+      expect(container.firstChild).toBeNull();
+      // Should not throw, just render empty
+    });
   });
 });
diff --git a/packages/contact-center/task/tests/TaskList/index.tsx b/packages/contact-center/task/tests/TaskList/index.tsx
index 78d7fd71b..1b03c075d 100644
--- a/packages/contact-center/task/tests/TaskList/index.tsx
+++ b/packages/contact-center/task/tests/TaskList/index.tsx
@@ -63,7 +63,7 @@ describe('TaskList Component', () => {
   });
 
   describe('ErrorBoundary Tests', () => {
-    it('should render empty fragment when ErrorBoundary catches an error', () => {
+    it('should render empty fragment when ErrorBoundary catches an error and onErrorCallback is defined', () => {
       const mockOnErrorCallback = jest.fn();
       store.onErrorCallback = mockOnErrorCallback;
       // Mock the useTaskList to throw an error
@@ -80,5 +80,21 @@ describe('TaskList Component', () => {
       expect(mockOnErrorCallback).toHaveBeenCalledWith('TaskList', expect.any(Error));
       expect(mockOnErrorCallback).toHaveBeenCalledTimes(1);
     });
+
+    it('should render empty fragment when ErrorBoundary catches an error and onErrorCallback is undefined', () => {
+      store.onErrorCallback = undefined;
+      // Mock the useTaskList to throw an error
+      jest.spyOn(helper, 'useTaskList').mockImplementation(() => {
+        throw new Error('Test error without callback');
+      });
+
+      const {container} = render(
+        <TaskList onTaskAccepted={jest.fn()} onTaskDeclined={jest.fn()} onTaskSelected={jest.fn()} />
+      );
+
+      // The fallback should render an empty fragment (no content)
+      expect(container.firstChild).toBeNull();
+      // Should not throw, just render empty
+    });
   });
 });
diff --git a/packages/contact-center/task/tests/helper.ts b/packages/contact-center/task/tests/helper.ts
index e97153b0c..3ce939d00 100644
--- a/packages/contact-center/task/tests/helper.ts
+++ b/packages/contact-center/task/tests/helper.ts
@@ -787,18 +787,33 @@ describe('useCallControl', () => {
     mockGetControlsVisibility.mockClear();
 
     const mockControlVisibility = {
-      muteUnmute: true,
-      holdResume: true,
-      transfer: true,
-      consult: true,
-      end: true,
-      accept: true,
-      decline: true,
-      pauseResumeRecording: true,
-      recordingIndicator: true,
-      wrapup: false,
-      endConsult: false,
-      conference: false,
+      muteUnmute: {isVisible: true, isEnabled: true},
+      muteUnmuteConsult: {isVisible: false, isEnabled: false},
+      holdResume: {isVisible: true, isEnabled: true},
+      transfer: {isVisible: true, isEnabled: true},
+      consult: {isVisible: true, isEnabled: true},
+      end: {isVisible: true, isEnabled: true},
+      accept: {isVisible: true, isEnabled: true},
+      decline: {isVisible: true, isEnabled: true},
+      pauseResumeRecording: {isVisible: true, isEnabled: true},
+      recordingIndicator: {isVisible: true, isEnabled: true},
+      wrapup: {isVisible: false, isEnabled: false},
+      endConsult: {isVisible: false, isEnabled: false},
+      conference: {isVisible: false, isEnabled: false},
+      consultTransfer: {isVisible: false, isEnabled: false},
+      mergeConference: {isVisible: false, isEnabled: false},
+      mergeConferenceConsult: {isVisible: false, isEnabled: false},
+      consultTransferConsult: {isVisible: false, isEnabled: false},
+      switchToMainCall: {isVisible: false, isEnabled: false},
+      switchToConsult: {isVisible: false, isEnabled: false},
+      exitConference: {isVisible: false, isEnabled: false},
+      isConferenceInProgress: false,
+      isConsultInitiated: false,
+      isConsultInitiatedAndAccepted: false,
+      isConsultInitiatedOrAccepted: false,
+      isConsultReceived: false,
+      isHeld: false,
+      consultCallHeld: false,
     };
     mockGetControlsVisibility.mockReturnValue(mockControlVisibility);
   });
@@ -831,8 +846,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -857,8 +873,9 @@ describe('useCallControl', () => {
         onWrapUp: jest.fn(),
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -893,8 +910,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -917,8 +935,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -943,8 +962,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -968,8 +988,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -991,8 +1012,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -1016,8 +1038,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -1048,8 +1071,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -1084,8 +1108,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -1106,8 +1131,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
     await waitFor(() => {
@@ -1132,8 +1158,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -1159,8 +1186,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -1187,8 +1215,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
     await waitFor(() => {
@@ -1213,8 +1242,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
     // Ensure no event handler is set
@@ -1234,8 +1264,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
     // Ensure no event handler is set
@@ -1253,8 +1284,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
     await act(async () => {
@@ -1276,8 +1308,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
     await act(async () => {
@@ -1302,8 +1335,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
     await act(async () => {
@@ -1333,8 +1367,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -1348,7 +1383,6 @@ describe('useCallControl', () => {
 
   it('should call consultCall successfully', async () => {
     mockCurrentTask.consult = jest.fn().mockResolvedValue('Consulted');
-    const setConsultInitiatedSpy = jest.spyOn(store, 'setConsultInitiated');
     const {result} = renderHook(() =>
       useCallControl({
         currentTask: mockCurrentTask,
@@ -1358,16 +1392,46 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
     await act(async () => {
-      await result.current.consultCall('dest123', 'agent');
+      await result.current.consultCall('dest123', 'agent', false);
+    });
+    expect(mockCurrentTask.consult).toHaveBeenCalledWith({
+      to: 'dest123',
+      destinationType: 'agent',
+      holdParticipants: true,
+    });
+  });
+
+  it('should call consultCall with allowParticipantsToInteract set to true', async () => {
+    mockCurrentTask.consult = jest.fn().mockResolvedValue('Consulted');
+
+    const {result} = renderHook(() =>
+      useCallControl({
+        currentTask: mockCurrentTask,
+        onHoldResume: mockOnHoldResume,
+        onEnd: mockOnEnd,
+        onWrapUp: mockOnWrapUp,
+        logger: mockLogger,
+        featureFlags: store.featureFlags,
+        deviceType: store.deviceType,
+        isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
+      })
+    );
+    await act(async () => {
+      await result.current.consultCall('dest123', 'agent', true);
+    });
+    expect(mockCurrentTask.consult).toHaveBeenCalledWith({
+      to: 'dest123',
+      destinationType: 'agent',
+      holdParticipants: false,
     });
-    expect(mockCurrentTask.consult).toHaveBeenCalledWith({to: 'dest123', destinationType: 'agent'});
-    expect(setConsultInitiatedSpy).toHaveBeenCalledWith(true);
-    setConsultInitiatedSpy.mockRestore();
   });
 
   it('should handle errors when calling consultCall', async () => {
@@ -1382,13 +1446,18 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
-    await expect(result.current.consultCall('dest123', 'agent')).rejects.toThrow(consultError);
-    expect(mockCurrentTask.consult).toHaveBeenCalledWith({to: 'dest123', destinationType: 'agent'});
+    await expect(result.current.consultCall('dest123', 'agent', false)).rejects.toThrow(consultError);
+    expect(mockCurrentTask.consult).toHaveBeenCalledWith({
+      to: 'dest123',
+      destinationType: 'agent',
+      holdParticipants: true,
+    });
     expect(mockLogger.error).toHaveBeenCalledWith('Error consulting call: Error: Consult failed', {
       module: 'widget-cc-task#helper.ts',
       method: 'useCallControl#consultCall',
@@ -1406,8 +1475,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: true,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
     await act(async () => {
@@ -1430,8 +1500,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -1450,8 +1521,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: true,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -1466,9 +1538,42 @@ describe('useCallControl', () => {
     });
   });
 
+  it('should handle endConsultCall when interactionId is missing', async () => {
+    const taskWithoutInteractionId = {
+      ...mockCurrentTask,
+      data: {
+        ...mockCurrentTask.data,
+        interactionId: undefined,
+      },
+    };
+
+    const {result} = renderHook(() =>
+      useCallControl({
+        currentTask: taskWithoutInteractionId,
+        onHoldResume: mockOnHoldResume,
+        onEnd: mockOnEnd,
+        onWrapUp: mockOnWrapUp,
+        logger: mockLogger,
+        featureFlags: store.featureFlags,
+        deviceType: store.deviceType,
+        isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
+      })
+    );
+
+    await act(async () => {
+      await result.current.endConsultCall();
+    });
+
+    expect(mockLogger.error).toHaveBeenCalledWith('Cannot end consult call: currentTask or interactionId is missing', {
+      module: 'widget-cc-task#helper.ts',
+      method: 'useCallControl#endConsultCall',
+    });
+  });
+
   it('should call consultTransfer successfully', async () => {
     mockCurrentTask.consultTransfer = jest.fn().mockResolvedValue('ConsultTransferred');
-    const setConsultInitiatedSpy = jest.spyOn(store, 'setConsultInitiated');
     const {result} = renderHook(() =>
       useCallControl({
         currentTask: mockCurrentTask,
@@ -1478,16 +1583,15 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: true,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
     await act(async () => {
       await result.current.consultTransfer();
     });
     expect(mockCurrentTask.consultTransfer).toHaveBeenCalled();
-    expect(setConsultInitiatedSpy).toHaveBeenCalledWith(true);
-    setConsultInitiatedSpy.mockRestore();
   });
 
   it('should handle errors when calling consultTransfer', async () => {
@@ -1502,8 +1606,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -1515,6 +1620,37 @@ describe('useCallControl', () => {
     });
   });
 
+  it('should handle consultTransfer when currentTask data is missing', async () => {
+    const taskWithoutData = {
+      ...mockCurrentTask,
+      data: undefined,
+    };
+
+    const {result} = renderHook(() =>
+      useCallControl({
+        currentTask: taskWithoutData,
+        onHoldResume: mockOnHoldResume,
+        onEnd: mockOnEnd,
+        onWrapUp: mockOnWrapUp,
+        logger: mockLogger,
+        featureFlags: store.featureFlags,
+        deviceType: store.deviceType,
+        isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
+      })
+    );
+
+    await act(async () => {
+      await result.current.consultTransfer();
+    });
+
+    expect(mockLogger.error).toHaveBeenCalledWith('Cannot transfer consult call: currentTask or data is missing', {
+      module: 'widget-cc-task#helper.ts',
+      method: 'useCallControl#consultTransfer',
+    });
+  });
+
   it('should extract consulting agent information correctly when initiating consult', async () => {
     // Mock store.cc.agentConfig.agentId for comparison
     const mockStoreCC = {
@@ -1564,10 +1700,11 @@ describe('useCallControl', () => {
       useCallControl({
         currentTask: taskWithParticipants,
         logger: mockLogger,
-        consultInitiated: true,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -1632,10 +1769,11 @@ describe('useCallControl', () => {
       useCallControl({
         currentTask: taskWithParticipants,
         logger: mockLogger,
-        consultInitiated: false,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -1693,10 +1831,11 @@ describe('useCallControl', () => {
       const hook = useCallControl({
         currentTask: taskWithoutConsultAgent,
         logger: mockLogger,
-        consultInitiated: true,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       });
       return hook;
     });
@@ -1713,10 +1852,12 @@ describe('useCallControl', () => {
 
   it('should handle missing interaction data gracefully', async () => {
     // Create a task with missing interaction data
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const {interaction, ...dataWithoutInteraction} = mockCurrentTask.data;
     const taskWithNoInteraction = {
       ...mockCurrentTask,
       data: {
-        ...mockCurrentTask.data,
+        ...dataWithoutInteraction,
         interactionId: 'someMockInteractionId',
         // No interaction property
       },
@@ -1731,8 +1872,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       });
       // Set initial value
       return hook;
@@ -1752,8 +1894,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -1802,8 +1945,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -1853,8 +1997,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -1898,8 +2043,9 @@ describe('useCallControl', () => {
           logger: mockLogger,
           featureFlags: store.featureFlags,
           deviceType: store.deviceType,
-          consultInitiated: false,
           isMuted: false,
+          multiPartyConferenceEnabled: true,
+          agentId: 'test-agent-id',
         }),
       {initialProps: {task: mockTaskWithHold}}
     );
@@ -1958,11 +2104,7 @@ describe('useCallControl', () => {
       },
     };
 
-    let setHoldTimeValue = 0;
-    // @ts-expect-error Mock useState to capture the holdTime value
-    jest.spyOn(React, 'useState').mockImplementation((init) => [init, (v) => (setHoldTimeValue = v)]);
-
-    renderHook(() =>
+    const {result} = renderHook(() =>
       useCallControl({
         currentTask: mockTaskWithHold,
         onHoldResume: mockOnHoldResume,
@@ -1971,17 +2113,16 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
     // The initial holdTime should be about 7 seconds
-    expect(setHoldTimeValue).toBeGreaterThanOrEqual(6);
-    expect(setHoldTimeValue).toBeLessThanOrEqual(7);
-
-    // Restore useState after this test so it doesn't affect others
-    (React.useState as unknown as {mockRestore?: () => void}).mockRestore?.();
+    // Note: We check the result.current.holdTime directly instead of mocking useState
+    expect(result.current.holdTime).toBeGreaterThanOrEqual(6);
+    expect(result.current.holdTime).toBeLessThanOrEqual(7);
   });
 
   it('should reset holdTime to 0 when the worker sends stop', async () => {
@@ -2029,8 +2170,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -2090,8 +2232,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -2105,7 +2248,6 @@ describe('useCallControl', () => {
     mockCurrentTask.consult = jest.fn().mockResolvedValue('Consulted');
     const setIsQueueConsultInProgressSpy = jest.spyOn(store, 'setIsQueueConsultInProgress');
     const setCurrentConsultQueueIdSpy = jest.spyOn(store, 'setCurrentConsultQueueId');
-    const setConsultInitiatedSpy = jest.spyOn(store, 'setConsultInitiated');
 
     const {result} = renderHook(() =>
       useCallControl({
@@ -2116,24 +2258,70 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
     await act(async () => {
-      await result.current.consultCall('queueId123', 'queue');
+      await result.current.consultCall('queueId123', 'queue', false);
     });
 
-    expect(mockCurrentTask.consult).toHaveBeenCalledWith({to: 'queueId123', destinationType: 'queue'});
+    expect(mockCurrentTask.consult).toHaveBeenCalledWith({
+      to: 'queueId123',
+      destinationType: 'queue',
+      holdParticipants: true,
+    });
+    expect(setIsQueueConsultInProgressSpy).toHaveBeenCalledWith(true);
+    expect(setCurrentConsultQueueIdSpy).toHaveBeenCalledWith('queueId123');
+    expect(setIsQueueConsultInProgressSpy).toHaveBeenCalledWith(false);
+    expect(setCurrentConsultQueueIdSpy).toHaveBeenCalledWith(null);
+
+    setIsQueueConsultInProgressSpy.mockRestore();
+    setCurrentConsultQueueIdSpy.mockRestore();
+  });
+
+  it('should handle errors when calling consultCall with queue destination type', async () => {
+    const consultError = new Error('Queue consult failed');
+    mockCurrentTask.consult = jest.fn().mockRejectedValue(consultError);
+    const setIsQueueConsultInProgressSpy = jest.spyOn(store, 'setIsQueueConsultInProgress');
+    const setCurrentConsultQueueIdSpy = jest.spyOn(store, 'setCurrentConsultQueueId');
+
+    const {result} = renderHook(() =>
+      useCallControl({
+        currentTask: mockCurrentTask,
+        onHoldResume: mockOnHoldResume,
+        onEnd: mockOnEnd,
+        onWrapUp: mockOnWrapUp,
+        logger: mockLogger,
+        featureFlags: store.featureFlags,
+        deviceType: store.deviceType,
+        isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
+      })
+    );
+
+    await expect(result.current.consultCall('queueId123', 'queue', false)).rejects.toThrow(consultError);
+
+    expect(mockCurrentTask.consult).toHaveBeenCalledWith({
+      to: 'queueId123',
+      destinationType: 'queue',
+      holdParticipants: true,
+    });
     expect(setIsQueueConsultInProgressSpy).toHaveBeenCalledWith(true);
     expect(setCurrentConsultQueueIdSpy).toHaveBeenCalledWith('queueId123');
+    // Check that cleanup happened on error
     expect(setIsQueueConsultInProgressSpy).toHaveBeenCalledWith(false);
     expect(setCurrentConsultQueueIdSpy).toHaveBeenCalledWith(null);
+    expect(mockLogger.error).toHaveBeenCalledWith('Error consulting call: Error: Queue consult failed', {
+      module: 'widget-cc-task#helper.ts',
+      method: 'useCallControl#consultCall',
+    });
 
     setIsQueueConsultInProgressSpy.mockRestore();
     setCurrentConsultQueueIdSpy.mockRestore();
-    setConsultInitiatedSpy.mockRestore();
   });
 
   it('should call endConsultCall with queue parameters when queue consult is in progress', async () => {
@@ -2147,8 +2335,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: true,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -2163,7 +2352,7 @@ describe('useCallControl', () => {
     });
   });
 
-  it('should load queues successfully', async () => {
+  it('should get queues via getQueuesFetcher', async () => {
     const getQueuesResponse: Awaited<ReturnType<typeof store.getQueues>> = {
       data: mockQueueDetails,
       meta: {page: 0, pageSize: mockQueueDetails.length, total: mockQueueDetails.length, totalPages: 1},
@@ -2176,16 +2365,16 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
-    await act(async () => {
-      await result.current.loadQueues();
-    });
+    const res = await result.current.getQueuesFetcher({page: 0, pageSize: mockQueueDetails.length});
 
-    expect(result.current.queues).toEqual(mockQueueDetails);
+    expect(res.data).toEqual(mockQueueDetails);
+    expect(res).toEqual(getQueuesResponse);
     getQueuesSpy.mockRestore();
   });
 
@@ -2199,8 +2388,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: false,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -2218,8 +2408,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: false,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -2240,8 +2431,9 @@ describe('useCallControl', () => {
         logger: mockLogger,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
-        consultInitiated: false,
         isMuted: false,
+        multiPartyConferenceEnabled: false,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -2260,10 +2452,11 @@ describe('useCallControl', () => {
         onWrapUp: mockOnWrapUp,
         onRecordingToggle: mockOnRecordingToggle,
         logger: mockLogger,
-        consultInitiated: false,
         featureFlags: store.featureFlags,
         deviceType: store.deviceType,
         isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
       })
     );
 
@@ -2278,6 +2471,35 @@ describe('useCallControl', () => {
     });
   });
 
+  it('should handle cancelAutoWrapup when currentTask is missing', async () => {
+    const {result} = renderHook(() =>
+      useCallControl({
+        currentTask: undefined,
+        onHoldResume: mockOnHoldResume,
+        onEnd: mockOnEnd,
+        onWrapUp: mockOnWrapUp,
+        logger: mockLogger,
+        featureFlags: store.featureFlags,
+        deviceType: store.deviceType,
+        isMuted: false,
+        multiPartyConferenceEnabled: true,
+        agentId: 'test-agent-id',
+      })
+    );
+
+    await act(async () => {
+      result.current.cancelAutoWrapup();
+    });
+
+    expect(mockLogger.warn).toHaveBeenCalledWith(
+      'CC-Widgets: CallControl: Cannot cancel auto-wrapup, currentTask is missing',
+      {
+        module: 'widget-cc-task#helper.ts',
+        method: 'useCallControl#cancelAutoWrapup',
+      }
+    );
+  });
+
   describe('toggleMute functionality', () => {
     const mockOnToggleMute = jest.fn();
 
@@ -2305,7 +2527,8 @@ describe('useCallControl', () => {
           featureFlags: store.featureFlags,
           deviceType: store.deviceType,
           isMuted: false,
-          consultInitiated: false,
+          multiPartyConferenceEnabled: true,
+          agentId: 'test-agent-id',
         })
       );
 
@@ -2338,7 +2561,8 @@ describe('useCallControl', () => {
           featureFlags: store.featureFlags,
           deviceType: store.deviceType,
           isMuted: true,
-          consultInitiated: false,
+          multiPartyConferenceEnabled: true,
+          agentId: 'test-agent-id',
         })
       );
 
@@ -2371,7 +2595,8 @@ describe('useCallControl', () => {
           featureFlags: store.featureFlags,
           deviceType: store.deviceType,
           isMuted: false,
-          consultInitiated: false,
+          multiPartyConferenceEnabled: true,
+          agentId: 'test-agent-id',
         })
       );
 
@@ -2392,7 +2617,8 @@ describe('useCallControl', () => {
           featureFlags: store.featureFlags,
           deviceType: store.deviceType,
           isMuted: false,
-          consultInitiated: false,
+          multiPartyConferenceEnabled: true,
+          agentId: 'test-agent-id',
         })
       );
 
@@ -2416,7 +2642,8 @@ describe('useCallControl', () => {
           featureFlags: store.featureFlags,
           deviceType: store.deviceType,
           isMuted: false,
-          consultInitiated: false,
+          multiPartyConferenceEnabled: true,
+          agentId: 'test-agent-id',
         })
       );
 
@@ -2445,7 +2672,8 @@ describe('useCallControl', () => {
           featureFlags: store.featureFlags,
           deviceType: store.deviceType,
           isMuted: true,
-          consultInitiated: false,
+          multiPartyConferenceEnabled: true,
+          agentId: 'test-agent-id',
         })
       );
 
@@ -2478,7 +2706,8 @@ describe('useCallControl', () => {
           featureFlags: store.featureFlags,
           deviceType: store.deviceType,
           isMuted: false,
-          consultInitiated: false,
+          multiPartyConferenceEnabled: true,
+          agentId: 'test-agent-id',
         })
       );
 
@@ -2497,7 +2726,8 @@ describe('useCallControl', () => {
           featureFlags: store.featureFlags,
           deviceType: store.deviceType,
           isMuted: false,
-          consultInitiated: false,
+          multiPartyConferenceEnabled: true,
+          agentId: 'test-agent-id',
         })
       );
 
@@ -2511,6 +2741,492 @@ describe('useCallControl', () => {
       });
       expect(mockCurrentTask.toggleMute).not.toHaveBeenCalled();
     });
+
+    it('should handle toggleMute error', async () => {
+      const error = new Error('toggleMute failed');
+      mockCurrentTask.toggleMute = jest.fn().mockRejectedValue(error);
+
+      const {result} = renderHook(() =>
+        useCallControl({
+          currentTask: mockCurrentTask,
+          onToggleMute: mockOnToggleMute,
+          logger: mockLogger,
+          featureFlags: store.featureFlags,
+          deviceType: store.deviceType,
+          isMuted: false,
+          multiPartyConferenceEnabled: true,
+          agentId: 'test-agent-id',
+        })
+      );
+
+      await act(async () => {
+        await result.current.toggleMute();
+      });
+
+      expect(mockLogger.error).toHaveBeenCalledWith('toggleMute failed: Error: toggleMute failed', {
+        module: 'useCallControl',
+        method: 'toggleMute',
+      });
+    });
+  });
+
+  describe('Conference Functions', () => {
+    describe('consultConference', () => {
+      it('should call consultConference successfully', async () => {
+        mockCurrentTask.consultConference = jest.fn().mockResolvedValue(undefined);
+
+        const {result} = renderHook(() =>
+          useCallControl({
+            currentTask: mockCurrentTask,
+            onHoldResume: mockOnHoldResume,
+            onEnd: mockOnEnd,
+            onWrapUp: mockOnWrapUp,
+            logger: mockLogger,
+            featureFlags: store.featureFlags,
+            deviceType: store.deviceType,
+            isMuted: false,
+            multiPartyConferenceEnabled: true,
+            agentId: 'test-agent-id',
+          })
+        );
+
+        await act(async () => {
+          await result.current.consultConference();
+        });
+
+        expect(mockCurrentTask.consultConference).toHaveBeenCalled();
+        expect(mockLogger.info).toHaveBeenCalledWith('consultConference success', {
+          module: 'useCallControl',
+          method: 'consultConference',
+        });
+      });
+
+      it('should handle consultConference error', async () => {
+        const error = new Error('consultConference failed');
+        mockCurrentTask.consultConference = jest.fn().mockRejectedValue(error);
+
+        const {result} = renderHook(() =>
+          useCallControl({
+            currentTask: mockCurrentTask,
+            onHoldResume: mockOnHoldResume,
+            onEnd: mockOnEnd,
+            onWrapUp: mockOnWrapUp,
+            logger: mockLogger,
+            featureFlags: store.featureFlags,
+            deviceType: store.deviceType,
+            isMuted: false,
+            multiPartyConferenceEnabled: true,
+            agentId: 'test-agent-id',
+          })
+        );
+
+        await expect(
+          act(async () => {
+            await result.current.consultConference();
+          })
+        ).rejects.toThrow('consultConference failed');
+
+        expect(mockLogger.error).toHaveBeenCalledWith('Error consulting conference: Error: consultConference failed', {
+          module: 'useCallControl',
+          method: 'consultConference',
+        });
+      });
+    });
+
+    describe('exitConference', () => {
+      it('should call exitConference successfully', async () => {
+        mockCurrentTask.exitConference = jest.fn().mockResolvedValue(undefined);
+
+        const {result} = renderHook(() =>
+          useCallControl({
+            currentTask: mockCurrentTask,
+            onHoldResume: mockOnHoldResume,
+            onEnd: mockOnEnd,
+            onWrapUp: mockOnWrapUp,
+            logger: mockLogger,
+            featureFlags: store.featureFlags,
+            deviceType: store.deviceType,
+            isMuted: false,
+            multiPartyConferenceEnabled: true,
+            agentId: 'test-agent-id',
+          })
+        );
+
+        await act(async () => {
+          await result.current.exitConference();
+        });
+
+        expect(mockCurrentTask.exitConference).toHaveBeenCalled();
+        expect(mockLogger.info).toHaveBeenCalledWith('exitConference success', {
+          module: 'useCallControl',
+          method: 'exitConference',
+        });
+      });
+
+      it('should handle exitConference error', async () => {
+        const error = new Error('exitConference failed');
+        mockCurrentTask.exitConference = jest.fn().mockRejectedValue(error);
+
+        const {result} = renderHook(() =>
+          useCallControl({
+            currentTask: mockCurrentTask,
+            onHoldResume: mockOnHoldResume,
+            onEnd: mockOnEnd,
+            onWrapUp: mockOnWrapUp,
+            logger: mockLogger,
+            featureFlags: store.featureFlags,
+            deviceType: store.deviceType,
+            isMuted: false,
+            multiPartyConferenceEnabled: true,
+            agentId: 'test-agent-id',
+          })
+        );
+
+        await expect(
+          act(async () => {
+            await result.current.exitConference();
+          })
+        ).rejects.toThrow('exitConference failed');
+
+        expect(mockLogger.error).toHaveBeenCalledWith('Error exiting conference: Error: exitConference failed', {
+          module: 'useCallControl',
+          method: 'exitConference',
+        });
+      });
+    });
+
+    describe('switchToMainCall', () => {
+      it('should call switchToMainCall successfully', async () => {
+        mockCurrentTask.resume = jest.fn().mockResolvedValue(undefined);
+
+        const {result} = renderHook(() =>
+          useCallControl({
+            currentTask: mockCurrentTask,
+            onHoldResume: mockOnHoldResume,
+            onEnd: mockOnEnd,
+            onWrapUp: mockOnWrapUp,
+            logger: mockLogger,
+            featureFlags: store.featureFlags,
+            deviceType: store.deviceType,
+            isMuted: false,
+            multiPartyConferenceEnabled: true,
+            agentId: 'test-agent-id',
+          })
+        );
+
+        await act(async () => {
+          await result.current.switchToMainCall();
+        });
+
+        expect(mockCurrentTask.resume).toHaveBeenCalled();
+      });
+
+      it('should handle switchToMainCall error', async () => {
+        const error = new Error('switchToMainCall failed');
+        mockCurrentTask.resume = jest.fn().mockRejectedValue(error);
+
+        const {result} = renderHook(() =>
+          useCallControl({
+            currentTask: mockCurrentTask,
+            onHoldResume: mockOnHoldResume,
+            onEnd: mockOnEnd,
+            onWrapUp: mockOnWrapUp,
+            logger: mockLogger,
+            featureFlags: store.featureFlags,
+            deviceType: store.deviceType,
+            isMuted: false,
+            multiPartyConferenceEnabled: true,
+            agentId: 'test-agent-id',
+          })
+        );
+
+        await expect(
+          act(async () => {
+            await result.current.switchToMainCall();
+          })
+        ).rejects.toThrow('switchToMainCall failed');
+
+        expect(mockLogger.error).toHaveBeenCalledWith('Error switchToMainCall: Error: switchToMainCall failed', {
+          module: 'useCallControl',
+          method: 'switchToMainCall',
+        });
+      });
+    });
+
+    describe('switchToConsult', () => {
+      it('should call switchToConsult successfully', async () => {
+        mockCurrentTask.hold = jest.fn().mockResolvedValue(undefined);
+
+        const {result} = renderHook(() =>
+          useCallControl({
+            currentTask: mockCurrentTask,
+            onHoldResume: mockOnHoldResume,
+            onEnd: mockOnEnd,
+            onWrapUp: mockOnWrapUp,
+            logger: mockLogger,
+            featureFlags: store.featureFlags,
+            deviceType: store.deviceType,
+            isMuted: false,
+            multiPartyConferenceEnabled: true,
+            agentId: 'test-agent-id',
+          })
+        );
+
+        await act(async () => {
+          await result.current.switchToConsult();
+        });
+
+        expect(mockCurrentTask.hold).toHaveBeenCalled();
+        expect(mockLogger.info).toHaveBeenCalledWith('switchToConsult success', {
+          module: 'useCallControl',
+          method: 'switchToConsult',
+        });
+      });
+
+      it('should handle switchToConsult error', async () => {
+        const error = new Error('switchToConsult failed');
+        mockCurrentTask.hold = jest.fn().mockRejectedValue(error);
+
+        const {result} = renderHook(() =>
+          useCallControl({
+            currentTask: mockCurrentTask,
+            onHoldResume: mockOnHoldResume,
+            onEnd: mockOnEnd,
+            onWrapUp: mockOnWrapUp,
+            logger: mockLogger,
+            featureFlags: store.featureFlags,
+            deviceType: store.deviceType,
+            isMuted: false,
+            multiPartyConferenceEnabled: true,
+            agentId: 'test-agent-id',
+          })
+        );
+
+        await expect(
+          act(async () => {
+            await result.current.switchToConsult();
+          })
+        ).rejects.toThrow('switchToConsult failed');
+
+        expect(mockLogger.error).toHaveBeenCalledWith('Error switching to consult: Error: switchToConsult failed', {
+          module: 'useCallControl',
+          method: 'switchToConsult',
+        });
+      });
+    });
+
+    describe('consultTransfer with conference in progress', () => {
+      it('should call transferConference when conference is in progress', async () => {
+        const taskWithConference = {
+          ...mockCurrentTask,
+          data: {
+            ...mockCurrentTask.data,
+            isConferenceInProgress: true,
+          },
+          transferConference: jest.fn().mockResolvedValue(undefined),
+        };
+
+        const {result} = renderHook(() =>
+          useCallControl({
+            currentTask: taskWithConference,
+            onHoldResume: mockOnHoldResume,
+            onEnd: mockOnEnd,
+            onWrapUp: mockOnWrapUp,
+            logger: mockLogger,
+            featureFlags: store.featureFlags,
+            deviceType: store.deviceType,
+            isMuted: false,
+            multiPartyConferenceEnabled: true,
+            agentId: 'test-agent-id',
+          })
+        );
+
+        await act(async () => {
+          await result.current.consultTransfer();
+        });
+
+        expect(mockLogger.info).toHaveBeenCalledWith('Conference in progress, using transferConference', {
+          module: 'useCallControl',
+          method: 'transferCall',
+        });
+        expect(taskWithConference.transferConference).toHaveBeenCalled();
+      });
+
+      it('should handle transferConference error when conference is in progress', async () => {
+        const error = new Error('transferConference failed');
+        const taskWithConference = {
+          ...mockCurrentTask,
+          data: {
+            ...mockCurrentTask.data,
+            isConferenceInProgress: true,
+          },
+          transferConference: jest.fn().mockRejectedValue(error),
+        };
+
+        const {result} = renderHook(() =>
+          useCallControl({
+            currentTask: taskWithConference,
+            onHoldResume: mockOnHoldResume,
+            onEnd: mockOnEnd,
+            onWrapUp: mockOnWrapUp,
+            logger: mockLogger,
+            featureFlags: store.featureFlags,
+            deviceType: store.deviceType,
+            isMuted: false,
+            multiPartyConferenceEnabled: true,
+            agentId: 'test-agent-id',
+          })
+        );
+
+        await expect(
+          act(async () => {
+            await result.current.consultTransfer();
+          })
+        ).rejects.toThrow('transferConference failed');
+
+        expect(mockLogger.error).toHaveBeenCalledWith(
+          'Error transferring consult call: Error: transferConference failed',
+          {
+            module: 'widget-cc-task#helper.ts',
+            method: 'useCallControl#consultTransfer',
+          }
+        );
+      });
+    });
+
+    describe('consult button disabled via controlVisibility with conference participants', () => {
+      it('should disable consult button when max participants reached in multi-party conference', () => {
+        const taskWithMaxParticipants = {
+          ...mockCurrentTask,
+          data: {
+            ...mockCurrentTask.data,
+            interactionId: 'main',
+            interaction: {
+              media: {
+                main: {
+                  participants: ['agent1', 'agent2', 'agent3', 'agent4', 'agent5', 'agent6', 'agent7', 'agent8'],
+                },
+              },
+              participants: {
+                agent1: {id: 'agent1', pType: 'Agent', hasLeft: false},
+                agent2: {id: 'agent2', pType: 'Agent', hasLeft: false},
+                agent3: {id: 'agent3', pType: 'Agent', hasLeft: false},
+                agent4: {id: 'agent4', pType: 'Agent', hasLeft: false},
+                agent5: {id: 'agent5', pType: 'Agent', hasLeft: false},
+                agent6: {id: 'agent6', pType: 'Agent', hasLeft: false},
+                agent7: {id: 'agent7', pType: 'Agent', hasLeft: false},
+                agent8: {id: 'agent8', pType: 'Agent', hasLeft: false},
+              },
+            },
+          },
+        };
+
+        store.cc.agentConfig = {agentId: 'agent1', regexUS: '', outdialANIId: ''};
+
+        const {result} = renderHook(() =>
+          useCallControl({
+            currentTask: taskWithMaxParticipants,
+            onHoldResume: mockOnHoldResume,
+            onEnd: mockOnEnd,
+            onWrapUp: mockOnWrapUp,
+            logger: mockLogger,
+            featureFlags: store.featureFlags,
+            deviceType: store.deviceType,
+            isMuted: false,
+            multiPartyConferenceEnabled: true,
+            agentId: 'test-agent-id',
+          })
+        );
+
+        // Should be disabled when 7 other agents (8 total - current agent = 7 >= 7 max)
+        expect(result.current.controlVisibility.consult.isEnabled).toBe(false);
+      });
+
+      it('should disable consult button when max participants reached in three-party conference', () => {
+        const taskWithThreeParticipants = {
+          ...mockCurrentTask,
+          data: {
+            ...mockCurrentTask.data,
+            interactionId: 'main',
+            interaction: {
+              media: {
+                main: {
+                  participants: ['agent1', 'agent2', 'agent3', 'agent4'],
+                },
+              },
+              participants: {
+                agent1: {id: 'agent1', pType: 'Agent', hasLeft: false},
+                agent2: {id: 'agent2', pType: 'Agent', hasLeft: false},
+                agent3: {id: 'agent3', pType: 'Agent', hasLeft: false},
+                agent4: {id: 'agent4', pType: 'Agent', hasLeft: false},
+              },
+            },
+          },
+        };
+
+        store.cc.agentConfig = {agentId: 'agent1', regexUS: '', outdialANIId: ''};
+
+        const {result} = renderHook(() =>
+          useCallControl({
+            currentTask: taskWithThreeParticipants,
+            onHoldResume: mockOnHoldResume,
+            onEnd: mockOnEnd,
+            onWrapUp: mockOnWrapUp,
+            logger: mockLogger,
+            featureFlags: store.featureFlags,
+            deviceType: store.deviceType,
+            isMuted: false,
+            multiPartyConferenceEnabled: false,
+            agentId: 'test-agent-id',
+          })
+        );
+
+        // Should be disabled when 3 other agents (4 total - current agent = 3 >= 3 max for three-party)
+        expect(result.current.controlVisibility.consult.isEnabled).toBe(false);
+      });
+
+      it('should enable consult button when below max participants', () => {
+        const taskWithFewParticipants = {
+          ...mockCurrentTask,
+          data: {
+            ...mockCurrentTask.data,
+            interactionId: 'main',
+            interaction: {
+              media: {
+                main: {
+                  participants: ['agent1', 'agent2', 'customer1'],
+                },
+              },
+              participants: {
+                agent1: {id: 'agent1', pType: 'Agent', hasLeft: false},
+                agent2: {id: 'agent2', pType: 'Agent', hasLeft: false},
+                customer1: {id: 'customer1', pType: 'Customer', hasLeft: false},
+              },
+            },
+          },
+        };
+
+        store.cc.agentConfig = {agentId: 'agent1', regexUS: '', outdialANIId: ''};
+
+        const {result} = renderHook(() =>
+          useCallControl({
+            currentTask: taskWithFewParticipants,
+            onHoldResume: mockOnHoldResume,
+            onEnd: mockOnEnd,
+            onWrapUp: mockOnWrapUp,
+            logger: mockLogger,
+            featureFlags: store.featureFlags,
+            deviceType: store.deviceType,
+            isMuted: false,
+            multiPartyConferenceEnabled: true,
+            agentId: 'test-agent-id',
+          })
+        );
+
+        // Should be enabled when only 1 other agent (2 - current agent = 1 < 7 max)
+        expect(result.current.controlVisibility.consult.isEnabled).toBe(true);
+      });
+    });
   });
 
   describe('useCallControl Error Handling', () => {
@@ -2551,10 +3267,11 @@ describe('useCallControl', () => {
           onRecordingToggle,
           onToggleMute,
           logger,
-          consultInitiated: false,
           deviceType: 'BROWSER',
           featureFlags: {webRtcEnabled: true},
           isMuted: false,
+          multiPartyConferenceEnabled: true,
+          agentId: 'test-agent-id',
         })
       );
 
@@ -2583,10 +3300,11 @@ describe('useCallControl', () => {
           onRecordingToggle,
           onToggleMute,
           logger,
-          consultInitiated: false,
           deviceType: 'BROWSER',
           featureFlags: {webRtcEnabled: true},
           isMuted: false,
+          multiPartyConferenceEnabled: true,
+          agentId: 'test-agent-id',
         })
       );
 
@@ -2623,10 +3341,11 @@ describe('useCallControl', () => {
           onRecordingToggle,
           onToggleMute,
           logger,
-          consultInitiated: false,
           deviceType: 'BROWSER',
           featureFlags: {webRtcEnabled: true},
           isMuted: false,
+          multiPartyConferenceEnabled: true,
+          agentId: 'test-agent-id',
         })
       );
 
@@ -2655,10 +3374,11 @@ describe('useCallControl', () => {
           onRecordingToggle,
           onToggleMute,
           logger,
-          consultInitiated: false,
           deviceType: 'BROWSER',
           featureFlags: {webRtcEnabled: true},
           isMuted: false,
+          multiPartyConferenceEnabled: true,
+          agentId: 'test-agent-id',
         })
       );
 
@@ -3037,3 +3757,955 @@ describe('useOutdialCall', () => {
     });
   });
 });
+
+describe('Task Hook Error Handling and Logging', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+    jest.restoreAllMocks();
+    logger.error.mockRestore();
+  });
+
+  describe('useTaskList - error scenarios', () => {
+    const mockTaskList = {
+      mockId1: taskMock,
+    };
+
+    it('should handle errors in setTaskRejected callback', () => {
+      const errorOnTaskDeclined = jest.fn().mockImplementation(() => {
+        throw new Error('Test error in onTaskDeclined');
+      });
+
+      store.setTaskRejected = jest.fn((callback) => {
+        store.onTaskRejected = callback;
+      });
+
+      renderHook(() =>
+        useTaskList({
+          cc: mockCC,
+          deviceType: 'BROWSER',
+          onTaskDeclined: errorOnTaskDeclined,
+          logger,
+          taskList: mockTaskList,
+        })
+      );
+
+      act(() => {
+        store.onTaskRejected(taskMock, 'test-reason');
+      });
+
+      expect(logger.error).toHaveBeenCalledWith(
+        'CC-Widgets: Task: Error in taskRejected callback - Test error in onTaskDeclined',
+        {
+          module: 'useTaskList',
+          method: 'setTaskRejected',
+        }
+      );
+    });
+
+    it('should handle errors in useTaskList useEffect setup', () => {
+      const errorLogger = {
+        ...logger,
+        log: jest.fn(),
+        info: jest.fn(),
+        error: jest.fn(),
+      };
+
+      // Force an error during useEffect setup
+      jest.spyOn(store, 'setTaskAssigned').mockImplementation(() => {
+        throw new Error('Setup error');
+      });
+
+      renderHook(() =>
+        useTaskList({
+          cc: mockCC,
+          deviceType: 'BROWSER',
+          onTaskAccepted: jest.fn(),
+          logger: errorLogger,
+          taskList: mockTaskList,
+        })
+      );
+
+      expect(errorLogger.error).toHaveBeenCalledWith('CC-Widgets: Task: Error in useTaskList useEffect - Setup error', {
+        module: 'useTaskList',
+        method: 'useEffect',
+      });
+    });
+
+    it('should handle synchronous errors in declineTask', () => {
+      const errorTask = {
+        ...taskMock,
+        decline: jest.fn().mockImplementation(() => {
+          throw new Error('Decline synchronous error');
+        }),
+      };
+
+      const {result} = renderHook(() =>
+        useTaskList({
+          cc: mockCC,
+          deviceType: 'BROWSER',
+          logger,
+          taskList: mockTaskList,
+        })
+      );
+
+      act(() => {
+        result.current.declineTask(errorTask);
+      });
+
+      expect(logger.error).toHaveBeenCalledWith('CC-Widgets: Task: Error in declineTask - Decline synchronous error', {
+        module: 'useTaskList',
+        method: 'declineTask',
+      });
+    });
+  });
+
+  describe('useIncomingTask - error scenarios', () => {
+    it('should handle errors in taskAssignCallback (consult accepted)', () => {
+      const errorOnAccepted = jest.fn().mockImplementation(() => {
+        throw new Error('Test error in onAccepted for consult');
+      });
+
+      const setTaskCallbackSpy = jest.spyOn(store, 'setTaskCallback');
+
+      renderHook(() =>
+        useIncomingTask({
+          onAccepted: errorOnAccepted,
+          deviceType: 'BROWSER',
+          incomingTask: taskMock,
+          logger,
+        })
+      );
+
+      const consultCallback = setTaskCallbackSpy.mock.calls.find(
+        (call) => call[0] === TASK_EVENTS.TASK_CONSULT_ACCEPTED
+      )?.[1];
+
+      act(() => {
+        consultCallback();
+      });
+
+      expect(logger.error).toHaveBeenCalledWith(
+        'CC-Widgets: Task: Error in taskAssignCallback - Test error in onAccepted for consult',
+        {
+          module: 'useIncomingTask',
+          method: 'taskAssignCallback',
+        }
+      );
+    });
+
+    it('should handle errors in taskRejectCallback', () => {
+      const errorOnRejected = jest.fn().mockImplementation(() => {
+        throw new Error('Test error in onRejected');
+      });
+
+      const setTaskCallbackSpy = jest.spyOn(store, 'setTaskCallback');
+
+      renderHook(() =>
+        useIncomingTask({
+          onRejected: errorOnRejected,
+          deviceType: 'BROWSER',
+          incomingTask: taskMock,
+          logger,
+        })
+      );
+
+      const rejectCallback = setTaskCallbackSpy.mock.calls.find((call) => call[0] === TASK_EVENTS.TASK_REJECT)?.[1];
+
+      act(() => {
+        rejectCallback();
+      });
+
+      expect(logger.error).toHaveBeenCalledWith(
+        'CC-Widgets: Task: Error in taskRejectCallback - Test error in onRejected',
+        {
+          module: 'useIncomingTask',
+          method: 'taskRejectCallback',
+        }
+      );
+    });
+
+    it('should handle errors in useIncomingTask cleanup', () => {
+      jest.spyOn(store, 'removeTaskCallback').mockImplementation(() => {
+        throw new Error('Cleanup error');
+      });
+
+      const {unmount} = renderHook(() =>
+        useIncomingTask({
+          onAccepted: jest.fn(),
+          deviceType: 'BROWSER',
+          incomingTask: taskMock,
+          logger,
+        })
+      );
+
+      act(() => {
+        unmount();
+      });
+
+      expect(logger.error).toHaveBeenCalledWith('CC-Widgets: Task: Error in useIncomingTask cleanup - Cleanup error', {
+        module: 'useIncomingTask',
+        method: 'useEffect_cleanup',
+      });
+    });
+
+    it('should handle errors in useIncomingTask useEffect setup', () => {
+      jest.spyOn(store, 'setTaskCallback').mockImplementation(() => {
+        throw new Error('Setup error in useEffect');
+      });
+
+      renderHook(() =>
+        useIncomingTask({
+          onAccepted: jest.fn(),
+          deviceType: 'BROWSER',
+          incomingTask: taskMock,
+          logger,
+        })
+      );
+
+      expect(logger.error).toHaveBeenCalledWith(
+        'CC-Widgets: Task: Error in useIncomingTask useEffect - Setup error in useEffect',
+        {
+          module: 'useIncomingTask',
+          method: 'useEffect',
+        }
+      );
+    });
+
+    it('should handle synchronous errors in reject', () => {
+      const errorTask = {
+        ...taskMock,
+        decline: jest.fn().mockImplementation(() => {
+          throw new Error('Reject synchronous error');
+        }),
+      };
+
+      const {result} = renderHook(() =>
+        useIncomingTask({
+          incomingTask: errorTask,
+          deviceType: 'BROWSER',
+          logger,
+        })
+      );
+
+      act(() => {
+        result.current.reject();
+      });
+
+      expect(logger.error).toHaveBeenCalledWith('CC-Widgets: Task: Error in reject - Reject synchronous error', {
+        module: 'useIncomingTask',
+        method: 'reject',
+      });
+    });
+  });
+
+  describe('useCallControl - error scenarios', () => {
+    const mockTaskWithInteraction = {
+      ...mockTask,
+      data: {
+        ...mockTask.data,
+        interactionId: 'interaction1',
+        interaction: {
+          participants: {
+            agent1: {
+              id: 'agent1',
+              pType: 'Agent',
+              joinTimestamp: 1234567890,
+            },
+          },
+          mediaType: 'telephony',
+        },
+        isConferenceInProgress: false,
+      },
+      hold: jest.fn().mockResolvedValue(undefined),
+      resume: jest.fn().mockResolvedValue(undefined),
+      end: jest.fn().mockResolvedValue(undefined),
+      wrapup: jest.fn().mockResolvedValue(undefined),
+      pauseRecording: jest.fn().mockResolvedValue(undefined),
+      resumeRecording: jest.fn().mockResolvedValue(undefined),
+      toggleMute: jest.fn().mockResolvedValue(undefined),
+      consult: jest.fn().mockResolvedValue(undefined),
+      endConsult: jest.fn().mockResolvedValue(undefined),
+      consultTransfer: jest.fn().mockResolvedValue(undefined),
+      transfer: jest.fn().mockResolvedValue(undefined),
+      cancelAutoWrapupTimer: jest.fn(),
+    };
+
+    beforeAll(() => {
+      store.store.cc = {
+        ...mockCC,
+        agentConfig: {
+          agentId: 'agent1',
+        },
+      } as IContactCenter;
+    });
+
+    it('should handle errors in resumeCallback', () => {
+      const errorOnHoldResume = jest.fn().mockImplementation(() => {
+        throw new Error('Test error in onHoldResume');
+      });
+
+      const setTaskCallbackSpy = jest.spyOn(store, 'setTaskCallback');
+
+      renderHook(() =>
+        useCallControl({
+          currentTask: mockTaskWithInteraction,
+          onHoldResume: errorOnHoldResume,
+          logger,
+          deviceType: 'BROWSER',
+          featureFlags: {},
+          isMuted: false,
+          multiPartyConferenceEnabled: false,
+          agentId: 'agent1',
+        })
+      );
+
+      const resumeCallback = setTaskCallbackSpy.mock.calls.find((call) => call[0] === TASK_EVENTS.TASK_RESUME)?.[1];
+
+      act(() => {
+        resumeCallback();
+      });
+
+      expect(logger.error).toHaveBeenCalledWith(
+        'CC-Widgets: Task: Error in resumeCallback - Test error in onHoldResume',
+        {
+          module: 'useCallControl',
+          method: 'resumeCallback',
+        }
+      );
+    });
+
+    it('should handle errors in endCallCallback', () => {
+      const errorOnEnd = jest.fn().mockImplementation(() => {
+        throw new Error('Test error in onEnd');
+      });
+
+      const setTaskCallbackSpy = jest.spyOn(store, 'setTaskCallback');
+
+      renderHook(() =>
+        useCallControl({
+          currentTask: mockTaskWithInteraction,
+          onEnd: errorOnEnd,
+          logger,
+          deviceType: 'BROWSER',
+          featureFlags: {},
+          isMuted: false,
+          multiPartyConferenceEnabled: false,
+          agentId: 'agent1',
+        })
+      );
+
+      const endCallback = setTaskCallbackSpy.mock.calls.find((call) => call[0] === TASK_EVENTS.TASK_END)?.[1];
+
+      act(() => {
+        endCallback();
+      });
+
+      expect(logger.error).toHaveBeenCalledWith('CC-Widgets: Task: Error in endCallCallback - Test error in onEnd', {
+        module: 'useCallControl',
+        method: 'endCallCallback',
+      });
+    });
+
+    it('should handle errors in wrapupCallCallback', () => {
+      const errorOnWrapUp = jest.fn().mockImplementation(() => {
+        throw new Error('Test error in onWrapUp');
+      });
+
+      const setTaskCallbackSpy = jest.spyOn(store, 'setTaskCallback');
+
+      renderHook(() =>
+        useCallControl({
+          currentTask: mockTaskWithInteraction,
+          onWrapUp: errorOnWrapUp,
+          logger,
+          deviceType: 'BROWSER',
+          featureFlags: {},
+          isMuted: false,
+          multiPartyConferenceEnabled: false,
+          agentId: 'agent1',
+        })
+      );
+
+      const wrapupCallback = setTaskCallbackSpy.mock.calls.find((call) => call[0] === TASK_EVENTS.AGENT_WRAPPEDUP)?.[1];
+
+      act(() => {
+        wrapupCallback({wrapUpAuxCodeId: '123'});
+      });
+
+      expect(logger.error).toHaveBeenCalledWith(
+        'CC-Widgets: Task: Error in wrapupCallCallback - Test error in onWrapUp',
+        {
+          module: 'useCallControl',
+          method: 'wrapupCallCallback',
+        }
+      );
+    });
+
+    it('should handle errors in pauseRecordingCallback', () => {
+      const errorOnRecordingToggle = jest.fn().mockImplementation(() => {
+        throw new Error('Test error in pauseRecording');
+      });
+
+      const setTaskCallbackSpy = jest.spyOn(store, 'setTaskCallback');
+
+      renderHook(() =>
+        useCallControl({
+          currentTask: mockTaskWithInteraction,
+          onRecordingToggle: errorOnRecordingToggle,
+          logger,
+          deviceType: 'BROWSER',
+          featureFlags: {},
+          isMuted: false,
+          multiPartyConferenceEnabled: false,
+          agentId: 'agent1',
+        })
+      );
+
+      const pauseCallback = setTaskCallbackSpy.mock.calls.find(
+        (call) => call[0] === TASK_EVENTS.TASK_RECORDING_PAUSED
+      )?.[1];
+
+      act(() => {
+        pauseCallback();
+      });
+
+      expect(logger.error).toHaveBeenCalledWith(
+        'CC-Widgets: Task: Error in pauseRecordingCallback - Test error in pauseRecording',
+        {
+          module: 'useCallControl',
+          method: 'pauseRecordingCallback',
+        }
+      );
+    });
+
+    it('should handle errors in resumeRecordingCallback', () => {
+      const errorOnRecordingToggle = jest.fn().mockImplementation(() => {
+        throw new Error('Test error in resumeRecording');
+      });
+
+      const setTaskCallbackSpy = jest.spyOn(store, 'setTaskCallback');
+
+      renderHook(() =>
+        useCallControl({
+          currentTask: mockTaskWithInteraction,
+          onRecordingToggle: errorOnRecordingToggle,
+          logger,
+          deviceType: 'BROWSER',
+          featureFlags: {},
+          isMuted: false,
+          multiPartyConferenceEnabled: false,
+          agentId: 'agent1',
+        })
+      );
+
+      const resumeCallback = setTaskCallbackSpy.mock.calls.find(
+        (call) => call[0] === TASK_EVENTS.TASK_RECORDING_RESUMED
+      )?.[1];
+
+      act(() => {
+        resumeCallback();
+      });
+
+      expect(logger.error).toHaveBeenCalledWith(
+        'CC-Widgets: Task: Error in resumeRecordingCallback - Test error in resumeRecording',
+        {
+          module: 'useCallControl',
+          method: 'resumeRecordingCallback',
+        }
+      );
+    });
+
+    it('should handle synchronous errors in toggleRecording', () => {
+      const errorTask = {
+        ...mockTaskWithInteraction,
+        pauseRecording: jest.fn().mockImplementation(() => {
+          throw new Error('toggleRecording synchronous error');
+        }),
+      };
+
+      const {result} = renderHook(() =>
+        useCallControl({
+          currentTask: errorTask,
+          logger,
+          deviceType: 'BROWSER',
+          featureFlags: {},
+          isMuted: false,
+          multiPartyConferenceEnabled: false,
+          agentId: 'agent1',
+        })
+      );
+
+      act(() => {
+        result.current.toggleRecording();
+      });
+
+      expect(logger.error).toHaveBeenCalledWith(
+        'CC-Widgets: Task: Error in toggleRecording - toggleRecording synchronous error',
+        {
+          module: 'useCallControl',
+          method: 'toggleRecording',
+        }
+      );
+    });
+
+    it('should handle synchronous errors in toggleMute', () => {
+      mockGetControlsVisibility.mockReturnValue({
+        muteUnmute: {isVisible: true, isEnabled: true},
+        muteUnmuteConsult: {isVisible: false, isEnabled: false},
+        holdResume: {isVisible: true, isEnabled: true},
+        transfer: {isVisible: true, isEnabled: true},
+        consult: {isVisible: true, isEnabled: true},
+        end: {isVisible: true, isEnabled: true},
+        accept: {isVisible: true, isEnabled: true},
+        decline: {isVisible: true, isEnabled: true},
+        pauseResumeRecording: {isVisible: true, isEnabled: true},
+        recordingIndicator: {isVisible: true, isEnabled: true},
+        wrapup: {isVisible: false, isEnabled: false},
+        endConsult: {isVisible: false, isEnabled: false},
+        conference: {isVisible: false, isEnabled: false},
+        consultTransfer: {isVisible: false, isEnabled: false},
+        mergeConference: {isVisible: false, isEnabled: false},
+        mergeConferenceConsult: {isVisible: false, isEnabled: false},
+        consultTransferConsult: {isVisible: false, isEnabled: false},
+        switchToMainCall: {isVisible: false, isEnabled: false},
+        switchToConsult: {isVisible: false, isEnabled: false},
+        exitConference: {isVisible: false, isEnabled: false},
+        isConferenceInProgress: false,
+        isConsultInitiated: false,
+        isConsultInitiatedAndAccepted: false,
+        isConsultInitiatedOrAccepted: false,
+        isConsultReceived: false,
+        isHeld: false,
+        consultCallHeld: false,
+      });
+
+      const errorTask = {
+        ...mockTaskWithInteraction,
+        toggleMute: jest.fn().mockImplementation(() => {
+          throw new Error('toggleMute synchronous error');
+        }),
+      };
+
+      const {result} = renderHook(() =>
+        useCallControl({
+          currentTask: errorTask,
+          logger,
+          deviceType: 'BROWSER',
+          featureFlags: {},
+          isMuted: false,
+          multiPartyConferenceEnabled: false,
+          agentId: 'agent1',
+        })
+      );
+
+      act(() => {
+        result.current.toggleMute();
+      });
+
+      expect(logger.error).toHaveBeenCalledWith('toggleMute failed: Error: toggleMute synchronous error', {
+        module: 'useCallControl',
+        method: 'toggleMute',
+      });
+    });
+
+    it('should handle synchronous errors in endCall', () => {
+      const errorTask = {
+        ...mockTaskWithInteraction,
+        end: jest.fn().mockImplementation(() => {
+          throw new Error('endCall synchronous error');
+        }),
+      };
+
+      const {result} = renderHook(() =>
+        useCallControl({
+          currentTask: errorTask,
+          logger,
+          deviceType: 'BROWSER',
+          featureFlags: {},
+          isMuted: false,
+          multiPartyConferenceEnabled: false,
+          agentId: 'agent1',
+        })
+      );
+
+      act(() => {
+        result.current.endCall();
+      });
+
+      expect(logger.error).toHaveBeenCalledWith('CC-Widgets: Task: Error in endCall - endCall synchronous error', {
+        module: 'useCallControl',
+        method: 'endCall',
+      });
+    });
+
+    it('should handle synchronous errors in wrapupCall', () => {
+      const errorTask = {
+        ...mockTaskWithInteraction,
+        wrapup: jest.fn().mockImplementation(() => {
+          throw new Error('wrapupCall synchronous error');
+        }),
+      };
+
+      const {result} = renderHook(() =>
+        useCallControl({
+          currentTask: errorTask,
+          logger,
+          deviceType: 'BROWSER',
+          featureFlags: {},
+          isMuted: false,
+          multiPartyConferenceEnabled: false,
+          agentId: 'agent1',
+        })
+      );
+
+      act(() => {
+        result.current.wrapupCall('test reason', '123');
+      });
+
+      expect(logger.error).toHaveBeenCalledWith(
+        'CC-Widgets: Task: Error in wrapupCall - wrapupCall synchronous error',
+        {
+          module: 'useCallControl',
+          method: 'wrapupCall',
+        }
+      );
+    });
+
+    it('should handle errors in getAddressBookEntries', async () => {
+      store.getAddressBookEntries = jest.fn().mockRejectedValue(new Error('Address book error'));
+
+      const {result} = renderHook(() =>
+        useCallControl({
+          currentTask: mockTaskWithInteraction,
+          logger,
+          deviceType: 'BROWSER',
+          featureFlags: {},
+          isMuted: false,
+          multiPartyConferenceEnabled: false,
+          agentId: 'agent1',
+        })
+      );
+
+      let response;
+      await act(async () => {
+        response = await result.current.getAddressBookEntries({page: 0, pageSize: 10, search: ''});
+      });
+
+      expect(logger.error).toHaveBeenCalledWith(
+        'CC-Widgets: Task: Error fetching address book entries - Address book error',
+        {
+          module: 'useCallControl',
+          method: 'getAddressBookEntries',
+        }
+      );
+      expect(response).toEqual({data: [], meta: {page: 0, totalPages: 0}});
+    });
+
+    it('should handle errors in getEntryPoints', async () => {
+      store.getEntryPoints = jest.fn().mockRejectedValue(new Error('Entry points error'));
+
+      const {result} = renderHook(() =>
+        useCallControl({
+          currentTask: mockTaskWithInteraction,
+          logger,
+          deviceType: 'BROWSER',
+          featureFlags: {},
+          isMuted: false,
+          multiPartyConferenceEnabled: false,
+          agentId: 'agent1',
+        })
+      );
+
+      let response;
+      await act(async () => {
+        response = await result.current.getEntryPoints({page: 0, pageSize: 10, search: ''});
+      });
+
+      expect(logger.error).toHaveBeenCalledWith('CC-Widgets: Task: Error fetching entry points - Entry points error', {
+        module: 'useCallControl',
+        method: 'getEntryPoints',
+      });
+      expect(response).toEqual({data: [], meta: {page: 0, totalPages: 0}});
+    });
+
+    it('should handle errors in getQueuesFetcher', async () => {
+      store.getQueues = jest.fn().mockRejectedValue(new Error('Queues error'));
+
+      const {result} = renderHook(() =>
+        useCallControl({
+          currentTask: mockTaskWithInteraction,
+          logger,
+          deviceType: 'BROWSER',
+          featureFlags: {},
+          isMuted: false,
+          multiPartyConferenceEnabled: false,
+          agentId: 'agent1',
+        })
+      );
+
+      let response;
+      await act(async () => {
+        response = await result.current.getQueuesFetcher({page: 0, pageSize: 10, search: ''});
+      });
+
+      expect(logger.error).toHaveBeenCalledWith('CC-Widgets: Task: Error fetching queues (paginated) - Queues error', {
+        module: 'useCallControl',
+        method: 'getQueuesFetcher',
+      });
+      expect(response).toEqual({data: [], meta: {page: 0, totalPages: 0}});
+    });
+
+    it('should set startTimestamp when conditions are met', () => {
+      const taskWithJoinTimestamp = {
+        ...mockTaskWithInteraction,
+        data: {
+          ...mockTaskWithInteraction.data,
+          interaction: {
+            ...mockTaskWithInteraction.data.interaction,
+            participants: {
+              agent1: {
+                id: 'agent1',
+                pType: 'Agent',
+                joinTimestamp: 9999999999,
+              },
+            },
+          },
+        },
+      };
+
+      store.store.cc = {
+        ...mockCC,
+        agentConfig: {
+          agentId: 'agent1',
+        },
+      } as IContactCenter;
+
+      const {result} = renderHook(() =>
+        useCallControl({
+          currentTask: taskWithJoinTimestamp,
+          logger,
+          deviceType: 'BROWSER',
+          featureFlags: {},
+          isMuted: false,
+          multiPartyConferenceEnabled: false,
+          agentId: 'agent1',
+        })
+      );
+
+      expect(result.current.startTimestamp).toBe(9999999999);
+    });
+
+    it('should handle errors in auto wrapup timer initialization', () => {
+      const mockAutoWrapup = {
+        getTimeLeftSeconds: jest.fn().mockImplementation(() => {
+          throw new Error('Auto wrapup timer error');
+        }),
+      };
+
+      mockGetControlsVisibility.mockReturnValue({
+        muteUnmute: {isVisible: true, isEnabled: true},
+        muteUnmuteConsult: {isVisible: false, isEnabled: false},
+        holdResume: {isVisible: true, isEnabled: true},
+        transfer: {isVisible: true, isEnabled: true},
+        consult: {isVisible: true, isEnabled: true},
+        end: {isVisible: true, isEnabled: true},
+        accept: {isVisible: true, isEnabled: true},
+        decline: {isVisible: true, isEnabled: true},
+        pauseResumeRecording: {isVisible: true, isEnabled: true},
+        recordingIndicator: {isVisible: true, isEnabled: true},
+        wrapup: {isVisible: true, isEnabled: true},
+        endConsult: {isVisible: false, isEnabled: false},
+        conference: {isVisible: false, isEnabled: false},
+        consultTransfer: {isVisible: false, isEnabled: false},
+        mergeConference: {isVisible: false, isEnabled: false},
+        mergeConferenceConsult: {isVisible: false, isEnabled: false},
+        consultTransferConsult: {isVisible: false, isEnabled: false},
+        switchToMainCall: {isVisible: false, isEnabled: false},
+        switchToConsult: {isVisible: false, isEnabled: false},
+        exitConference: {isVisible: false, isEnabled: false},
+        isConferenceInProgress: false,
+        isConsultInitiated: false,
+        isConsultInitiatedAndAccepted: false,
+        isConsultInitiatedOrAccepted: false,
+        isConsultReceived: false,
+        isHeld: false,
+        consultCallHeld: false,
+      });
+
+      const taskWithAutoWrapup = {
+        ...mockTaskWithInteraction,
+        autoWrapup: mockAutoWrapup,
+      };
+
+      renderHook(() =>
+        useCallControl({
+          currentTask: taskWithAutoWrapup,
+          logger,
+          deviceType: 'BROWSER',
+          featureFlags: {},
+          isMuted: false,
+          multiPartyConferenceEnabled: false,
+          agentId: 'agent1',
+        })
+      );
+
+      expect(logger.error).toHaveBeenCalledWith('CC-Widgets: CallControl: Error initializing auto wrap-up timer', {
+        module: 'widget-cc-task#helper.ts',
+        method: 'useCallControl#autoWrapupTimer',
+        error: expect.any(Error),
+      });
+    });
+
+    it('should clear interval on unmount for auto wrapup timer', () => {
+      jest.useFakeTimers();
+      const clearIntervalSpy = jest.spyOn(global, 'clearInterval');
+
+      const mockAutoWrapup = {
+        getTimeLeftSeconds: jest.fn().mockReturnValue(30),
+      };
+
+      mockGetControlsVisibility.mockReturnValue({
+        muteUnmute: {isVisible: true, isEnabled: true},
+        muteUnmuteConsult: {isVisible: false, isEnabled: false},
+        holdResume: {isVisible: true, isEnabled: true},
+        transfer: {isVisible: true, isEnabled: true},
+        consult: {isVisible: true, isEnabled: true},
+        end: {isVisible: true, isEnabled: true},
+        accept: {isVisible: true, isEnabled: true},
+        decline: {isVisible: true, isEnabled: true},
+        pauseResumeRecording: {isVisible: true, isEnabled: true},
+        recordingIndicator: {isVisible: true, isEnabled: true},
+        wrapup: {isVisible: true, isEnabled: true},
+        endConsult: {isVisible: false, isEnabled: false},
+        conference: {isVisible: false, isEnabled: false},
+        consultTransfer: {isVisible: false, isEnabled: false},
+        mergeConference: {isVisible: false, isEnabled: false},
+        mergeConferenceConsult: {isVisible: false, isEnabled: false},
+        consultTransferConsult: {isVisible: false, isEnabled: false},
+        switchToMainCall: {isVisible: false, isEnabled: false},
+        switchToConsult: {isVisible: false, isEnabled: false},
+        exitConference: {isVisible: false, isEnabled: false},
+        isConferenceInProgress: false,
+        isConsultInitiated: false,
+        isConsultInitiatedAndAccepted: false,
+        isConsultInitiatedOrAccepted: false,
+        isConsultReceived: false,
+        isHeld: false,
+        consultCallHeld: false,
+      });
+
+      const taskWithAutoWrapup = {
+        ...mockTaskWithInteraction,
+        autoWrapup: mockAutoWrapup,
+      };
+
+      const {unmount} = renderHook(() =>
+        useCallControl({
+          currentTask: taskWithAutoWrapup,
+          logger,
+          deviceType: 'BROWSER',
+          featureFlags: {},
+          isMuted: false,
+          multiPartyConferenceEnabled: false,
+          agentId: 'agent1',
+        })
+      );
+
+      act(() => {
+        unmount();
+      });
+
+      expect(clearIntervalSpy).toHaveBeenCalled();
+      jest.useRealTimers();
+    });
+
+    it('should handle worker cleanup with non-function postMessage', () => {
+      const mockTaskWithHold = {
+        ...mockTaskWithInteraction,
+        data: {
+          ...mockTaskWithInteraction.data,
+          interaction: {
+            ...mockTaskWithInteraction.data.interaction,
+            callProcessingDetails: {
+              mainCall: {
+                events: [{type: 'Hold', eventTime: Date.now() - 5000}],
+              },
+            },
+          },
+        },
+      };
+
+      // Mock Worker with non-function postMessage
+      const mockWorker = {
+        postMessage: undefined,
+        terminate: jest.fn(),
+        onmessage: null,
+      };
+
+      global.Worker = jest.fn().mockImplementation(() => mockWorker);
+      global.URL.createObjectURL = jest.fn().mockReturnValue('blob:mock');
+
+      const {unmount} = renderHook(() =>
+        useCallControl({
+          currentTask: mockTaskWithHold,
+          logger,
+          deviceType: 'BROWSER',
+          featureFlags: {},
+          isMuted: false,
+          multiPartyConferenceEnabled: false,
+          agentId: 'agent1',
+        })
+      );
+
+      act(() => {
+        unmount();
+      });
+
+      // Should not throw error when postMessage is not a function
+      // Test passes if no error is thrown during unmount
+    });
+
+    it('should handle worker cleanup with non-function terminate', () => {
+      const mockTaskWithHold = {
+        ...mockTaskWithInteraction,
+        data: {
+          ...mockTaskWithInteraction.data,
+          interaction: {
+            ...mockTaskWithInteraction.data.interaction,
+            callProcessingDetails: {
+              mainCall: {
+                events: [{type: 'Hold', eventTime: Date.now() - 5000}],
+              },
+            },
+          },
+        },
+      };
+
+      // Mock Worker with non-function terminate
+      const mockWorker = {
+        postMessage: jest.fn(),
+        terminate: undefined,
+        onmessage: null,
+      };
+
+      global.Worker = jest.fn().mockImplementation(() => mockWorker);
+      global.URL.createObjectURL = jest.fn().mockReturnValue('blob:mock');
+
+      const {unmount} = renderHook(() =>
+        useCallControl({
+          currentTask: mockTaskWithHold,
+          logger,
+          deviceType: 'BROWSER',
+          featureFlags: {},
+          isMuted: false,
+          multiPartyConferenceEnabled: false,
+          agentId: 'agent1',
+        })
+      );
+
+      act(() => {
+        unmount();
+      });
+    });
+  });
+});
diff --git a/packages/contact-center/task/tests/utils/task-util.ts b/packages/contact-center/task/tests/utils/task-util.ts
index 3fc45299b..22fe1ad88 100644
--- a/packages/contact-center/task/tests/utils/task-util.ts
+++ b/packages/contact-center/task/tests/utils/task-util.ts
@@ -1,5 +1,23 @@
 import {mockTask} from '@webex/test-fixtures';
 import {findHoldTimestamp, getControlsVisibility} from '../../src/Utils/task-util';
+import {getIsConferenceInProgress, getConferenceParticipants} from '@webex/cc-store';
+import {ITask, TaskData, Interaction} from '@webex/contact-center';
+
+// Helper function to create properly typed partial task objects for testing
+const createMockTask = (data: Partial<TaskData>): ITask => {
+  return {
+    ...mockTask,
+    data: {
+      ...mockTask.data,
+      ...data,
+    } as TaskData,
+  };
+};
+
+// Helper to create partial interaction data with proper typing
+const createPartialInteraction = (interaction: unknown): TaskData['interaction'] => {
+  return interaction as TaskData['interaction'];
+};
 describe('getControlsVisibility', () => {
   it('should show correct controls when station logis is BROWSER, all flags are enabled and media type is telehphony', () => {
     const deviceType = 'BROWSER';
@@ -10,21 +28,36 @@ describe('getControlsVisibility', () => {
     };
     // Updating
     const expectedControls = {
-      accept: true,
-      decline: true,
-      end: true,
-      muteUnmute: true,
-      holdResume: true,
-      consult: true,
-      transfer: true,
-      conference: true,
-      wrapup: false,
-      pauseResumeRecording: true,
-      endConsult: true,
-      recordingIndicator: true,
+      accept: {isVisible: true, isEnabled: true},
+      decline: {isVisible: true, isEnabled: true},
+      end: {isVisible: true, isEnabled: true},
+      muteUnmute: {isVisible: true, isEnabled: true}, // Visible for browser with webRTC enabled
+      muteUnmuteConsult: {isVisible: false, isEnabled: true}, // Not visible when no consult in progress
+      holdResume: {isVisible: true, isEnabled: true},
+      consult: {isVisible: true, isEnabled: true},
+      transfer: {isVisible: true, isEnabled: true},
+      conference: {isVisible: true, isEnabled: true},
+      wrapup: {isVisible: false, isEnabled: true},
+      pauseResumeRecording: {isVisible: true, isEnabled: true},
+      endConsult: {isVisible: false, isEnabled: true}, // Not visible when no consult in progress
+      consultTransfer: {isVisible: false, isEnabled: false}, // Not visible when no consult in progress
+      mergeConference: {isVisible: false, isEnabled: false}, // Not visible when no consult in progress
+      mergeConferenceConsult: {isVisible: false, isEnabled: false}, // Not enabled when consult not accepted
+      consultTransferConsult: {isVisible: false, isEnabled: false}, // Not enabled when consult not accepted
+      switchToMainCall: {isVisible: false, isEnabled: false},
+      switchToConsult: {isVisible: false, isEnabled: true},
+      exitConference: {isVisible: false, isEnabled: true}, // Not visible when no conference in progress
+      recordingIndicator: {isVisible: true, isEnabled: true},
+      isConferenceInProgress: false,
+      isConsultInitiated: false,
+      isConsultInitiatedAndAccepted: false,
+      isConsultInitiatedOrAccepted: false,
+      isConsultReceived: false,
+      isHeld: false,
+      consultCallHeld: false,
     };
 
-    expect(getControlsVisibility(deviceType, featureFlags, mockTask)).toEqual(expectedControls);
+    expect(getControlsVisibility(deviceType, featureFlags, mockTask, 'agent1', false)).toEqual(expectedControls);
   });
 
   it('should show correct controls when station logis is BROWSER, webRtcEnabled is disbaled and media type is telehphony', () => {
@@ -36,21 +69,36 @@ describe('getControlsVisibility', () => {
     };
 
     const expectedControls = {
-      accept: false,
-      decline: false,
-      end: true,
-      muteUnmute: false,
-      holdResume: false,
-      consult: false,
-      transfer: false,
-      conference: false,
-      wrapup: false,
-      pauseResumeRecording: false,
-      endConsult: false,
-      recordingIndicator: true,
+      accept: {isVisible: false, isEnabled: true},
+      decline: {isVisible: false, isEnabled: true},
+      end: {isVisible: true, isEnabled: true},
+      muteUnmute: {isVisible: false, isEnabled: true},
+      muteUnmuteConsult: {isVisible: false, isEnabled: true},
+      holdResume: {isVisible: false, isEnabled: true},
+      consult: {isVisible: false, isEnabled: true},
+      transfer: {isVisible: false, isEnabled: true},
+      conference: {isVisible: false, isEnabled: true},
+      wrapup: {isVisible: false, isEnabled: true},
+      pauseResumeRecording: {isVisible: false, isEnabled: true},
+      endConsult: {isVisible: false, isEnabled: true},
+      consultTransfer: {isVisible: false, isEnabled: false},
+      mergeConference: {isVisible: false, isEnabled: false},
+      mergeConferenceConsult: {isVisible: false, isEnabled: false}, // Not enabled when consult not accepted
+      consultTransferConsult: {isVisible: false, isEnabled: false}, // Not enabled when consult not accepted
+      switchToMainCall: {isVisible: false, isEnabled: false},
+      switchToConsult: {isVisible: false, isEnabled: true},
+      exitConference: {isVisible: false, isEnabled: true},
+      recordingIndicator: {isVisible: true, isEnabled: true},
+      isConferenceInProgress: false,
+      isConsultInitiated: false,
+      isConsultInitiatedAndAccepted: false,
+      isConsultInitiatedOrAccepted: false,
+      isConsultReceived: false,
+      isHeld: false,
+      consultCallHeld: false,
     };
 
-    expect(getControlsVisibility(deviceType, featureFlags, mockTask)).toEqual(expectedControls);
+    expect(getControlsVisibility(deviceType, featureFlags, mockTask, 'agent1', false)).toEqual(expectedControls);
   });
 
   it('should show correct controls when station logis is BROWSER, isEndCallEnabled is disbaled and media type is telehphony', () => {
@@ -62,21 +110,36 @@ describe('getControlsVisibility', () => {
     };
 
     const expectedControls = {
-      accept: true,
-      decline: true,
-      end: true,
-      muteUnmute: true,
-      holdResume: true,
-      consult: true,
-      transfer: true,
-      conference: true,
-      wrapup: false,
-      pauseResumeRecording: true,
-      endConsult: true,
-      recordingIndicator: true,
+      accept: {isVisible: true, isEnabled: true},
+      decline: {isVisible: true, isEnabled: true},
+      end: {isVisible: true, isEnabled: true},
+      muteUnmute: {isVisible: true, isEnabled: true}, // Visible for browser with webRTC enabled
+      muteUnmuteConsult: {isVisible: false, isEnabled: true}, // Not visible when no consult in progress
+      holdResume: {isVisible: true, isEnabled: true},
+      consult: {isVisible: true, isEnabled: true},
+      transfer: {isVisible: true, isEnabled: true},
+      conference: {isVisible: true, isEnabled: true},
+      wrapup: {isVisible: false, isEnabled: true},
+      pauseResumeRecording: {isVisible: true, isEnabled: true},
+      endConsult: {isVisible: false, isEnabled: true}, // Not visible when no consult in progress
+      consultTransfer: {isVisible: false, isEnabled: false}, // Not visible when no consult in progress
+      mergeConference: {isVisible: false, isEnabled: false}, // Not visible when no consult in progress
+      mergeConferenceConsult: {isVisible: false, isEnabled: false}, // Not enabled when consult not accepted
+      consultTransferConsult: {isVisible: false, isEnabled: false}, // Not enabled when consult not accepted
+      switchToMainCall: {isVisible: false, isEnabled: false},
+      switchToConsult: {isVisible: false, isEnabled: true},
+      exitConference: {isVisible: false, isEnabled: true}, // Not visible when no conference in progress
+      recordingIndicator: {isVisible: true, isEnabled: true},
+      isConferenceInProgress: false,
+      isConsultInitiated: false,
+      isConsultInitiatedAndAccepted: false,
+      isConsultInitiatedOrAccepted: false,
+      isConsultReceived: false,
+      isHeld: false,
+      consultCallHeld: false,
     };
 
-    expect(getControlsVisibility(deviceType, featureFlags, mockTask)).toEqual(expectedControls);
+    expect(getControlsVisibility(deviceType, featureFlags, mockTask, 'agent1', false)).toEqual(expectedControls);
   });
 
   it('should show correct controls when station logis is BROWSER, isEndConsultEnabled is disbaled and media type is telehphony', () => {
@@ -94,21 +157,36 @@ describe('getControlsVisibility', () => {
     };
 
     const expectedControls = {
-      accept: true,
-      decline: true,
-      end: true,
-      muteUnmute: true,
-      holdResume: true,
-      consult: true,
-      transfer: true,
-      conference: true,
-      wrapup: false,
-      pauseResumeRecording: true,
-      endConsult: false,
-      recordingIndicator: true,
+      accept: {isVisible: true, isEnabled: true},
+      decline: {isVisible: true, isEnabled: true},
+      end: {isVisible: true, isEnabled: true},
+      muteUnmute: {isVisible: true, isEnabled: true}, // Visible for browser with webRTC enabled
+      muteUnmuteConsult: {isVisible: false, isEnabled: true}, // Not visible when no consult in progress
+      holdResume: {isVisible: true, isEnabled: true},
+      consult: {isVisible: true, isEnabled: true},
+      transfer: {isVisible: true, isEnabled: true},
+      conference: {isVisible: true, isEnabled: true},
+      wrapup: {isVisible: false, isEnabled: true},
+      pauseResumeRecording: {isVisible: true, isEnabled: true},
+      endConsult: {isVisible: false, isEnabled: true}, // Not visible when isEndConsultEnabled is false
+      consultTransfer: {isVisible: false, isEnabled: false}, // Not visible when no consult in progress
+      mergeConference: {isVisible: false, isEnabled: false}, // Not visible when no consult in progress
+      mergeConferenceConsult: {isVisible: false, isEnabled: false}, // Not enabled when consult not accepted
+      consultTransferConsult: {isVisible: false, isEnabled: false}, // Not enabled when consult not accepted
+      switchToMainCall: {isVisible: false, isEnabled: false},
+      switchToConsult: {isVisible: false, isEnabled: true},
+      exitConference: {isVisible: false, isEnabled: true}, // Not visible when no conference in progress
+      recordingIndicator: {isVisible: true, isEnabled: true},
+      isConferenceInProgress: false,
+      isConsultInitiated: false,
+      isConsultInitiatedAndAccepted: false,
+      isConsultInitiatedOrAccepted: false,
+      isConsultReceived: false,
+      isHeld: false,
+      consultCallHeld: false,
     };
 
-    expect(getControlsVisibility(deviceType, featureFlags, task)).toEqual(expectedControls);
+    expect(getControlsVisibility(deviceType, featureFlags, task, 'agent1', false)).toEqual(expectedControls);
   });
 
   it('should show correct controls when station logis is AGENT_DN, all flags are enabled and media type is telehphony', () => {
@@ -120,21 +198,36 @@ describe('getControlsVisibility', () => {
     };
 
     const expectedControls = {
-      accept: false,
-      decline: false,
-      end: true,
-      muteUnmute: false,
-      holdResume: true,
-      consult: true,
-      transfer: true,
-      conference: false,
-      wrapup: false,
-      pauseResumeRecording: true,
-      endConsult: true,
-      recordingIndicator: true,
+      accept: {isVisible: false, isEnabled: true},
+      decline: {isVisible: false, isEnabled: true},
+      end: {isVisible: true, isEnabled: true},
+      muteUnmute: {isVisible: false, isEnabled: true},
+      muteUnmuteConsult: {isVisible: false, isEnabled: true},
+      holdResume: {isVisible: true, isEnabled: true},
+      consult: {isVisible: true, isEnabled: true},
+      transfer: {isVisible: true, isEnabled: true},
+      conference: {isVisible: false, isEnabled: true},
+      wrapup: {isVisible: false, isEnabled: true},
+      pauseResumeRecording: {isVisible: true, isEnabled: true},
+      endConsult: {isVisible: false, isEnabled: true}, // Not visible when no consult in progress
+      consultTransfer: {isVisible: false, isEnabled: false}, // Not visible when no consult in progress
+      mergeConference: {isVisible: false, isEnabled: false}, // Not visible when no consult in progress
+      mergeConferenceConsult: {isVisible: false, isEnabled: false}, // Not enabled when consult not accepted
+      consultTransferConsult: {isVisible: false, isEnabled: false}, // Not enabled when consult not accepted
+      switchToMainCall: {isVisible: false, isEnabled: false},
+      switchToConsult: {isVisible: false, isEnabled: true},
+      exitConference: {isVisible: false, isEnabled: true}, // Not visible when no conference in progress
+      recordingIndicator: {isVisible: true, isEnabled: true},
+      isConferenceInProgress: false,
+      isConsultInitiated: false,
+      isConsultInitiatedAndAccepted: false,
+      isConsultInitiatedOrAccepted: false,
+      isConsultReceived: false,
+      isHeld: false,
+      consultCallHeld: false,
     };
 
-    expect(getControlsVisibility(deviceType, featureFlags, mockTask)).toEqual(expectedControls);
+    expect(getControlsVisibility(deviceType, featureFlags, mockTask, 'agent1', false)).toEqual(expectedControls);
   });
 
   it('should show correct controls when station logis is EXTENSION, all flags are enabled and media type is telehphony', () => {
@@ -149,21 +242,36 @@ describe('getControlsVisibility', () => {
     task.data.interaction.mediaType = 'telephony';
 
     const expectedControls = {
-      accept: false,
-      decline: false,
-      end: true,
-      muteUnmute: false,
-      holdResume: true,
-      consult: true,
-      transfer: true,
-      conference: false,
-      wrapup: false,
-      pauseResumeRecording: true,
-      endConsult: true,
-      recordingIndicator: true,
+      accept: {isVisible: false, isEnabled: true},
+      decline: {isVisible: false, isEnabled: true},
+      end: {isVisible: true, isEnabled: true},
+      muteUnmute: {isVisible: false, isEnabled: true},
+      muteUnmuteConsult: {isVisible: false, isEnabled: true},
+      holdResume: {isVisible: true, isEnabled: true},
+      consult: {isVisible: true, isEnabled: true},
+      transfer: {isVisible: true, isEnabled: true},
+      conference: {isVisible: false, isEnabled: true},
+      wrapup: {isVisible: false, isEnabled: true},
+      pauseResumeRecording: {isVisible: true, isEnabled: true},
+      endConsult: {isVisible: false, isEnabled: true}, // Not visible when no consult in progress
+      consultTransfer: {isVisible: false, isEnabled: false}, // Not visible when no consult in progress
+      mergeConference: {isVisible: false, isEnabled: false}, // Not visible when no consult in progress
+      mergeConferenceConsult: {isVisible: false, isEnabled: false}, // Not enabled when consult not accepted
+      consultTransferConsult: {isVisible: false, isEnabled: false}, // Not enabled when consult not accepted
+      switchToMainCall: {isVisible: false, isEnabled: false},
+      switchToConsult: {isVisible: false, isEnabled: true},
+      exitConference: {isVisible: false, isEnabled: true}, // Not visible when no conference in progress
+      recordingIndicator: {isVisible: true, isEnabled: true},
+      isConferenceInProgress: false,
+      isConsultInitiated: false,
+      isConsultInitiatedAndAccepted: false,
+      isConsultInitiatedOrAccepted: false,
+      isConsultReceived: false,
+      isHeld: false,
+      consultCallHeld: false,
     };
 
-    expect(getControlsVisibility(deviceType, featureFlags, task)).toEqual(expectedControls);
+    expect(getControlsVisibility(deviceType, featureFlags, task, 'agent1', false)).toEqual(expectedControls);
   });
 
   it('should show correct controls when station logis is EXTENSION, all flags are enabled and media type is chat', () => {
@@ -178,21 +286,36 @@ describe('getControlsVisibility', () => {
     task.data.interaction.mediaType = 'chat';
 
     const expectedControls = {
-      accept: true,
-      decline: false,
-      end: true,
-      muteUnmute: false,
-      holdResume: false,
-      consult: false,
-      transfer: true,
-      conference: true,
-      wrapup: false,
-      pauseResumeRecording: false,
-      endConsult: false,
-      recordingIndicator: false,
+      accept: {isVisible: true, isEnabled: true},
+      decline: {isVisible: false, isEnabled: true},
+      end: {isVisible: true, isEnabled: true},
+      muteUnmute: {isVisible: false, isEnabled: true},
+      muteUnmuteConsult: {isVisible: false, isEnabled: true},
+      holdResume: {isVisible: false, isEnabled: true},
+      consult: {isVisible: false, isEnabled: true},
+      transfer: {isVisible: true, isEnabled: true},
+      conference: {isVisible: true, isEnabled: true},
+      wrapup: {isVisible: false, isEnabled: true},
+      pauseResumeRecording: {isVisible: false, isEnabled: true},
+      endConsult: {isVisible: false, isEnabled: true},
+      consultTransfer: {isVisible: false, isEnabled: false},
+      mergeConference: {isVisible: false, isEnabled: false},
+      mergeConferenceConsult: {isVisible: false, isEnabled: false}, // Not enabled when consult not accepted
+      consultTransferConsult: {isVisible: false, isEnabled: false}, // Not enabled when consult not accepted
+      switchToMainCall: {isVisible: false, isEnabled: false},
+      switchToConsult: {isVisible: false, isEnabled: true},
+      exitConference: {isVisible: false, isEnabled: true},
+      recordingIndicator: {isVisible: false, isEnabled: true},
+      isConferenceInProgress: false,
+      isConsultInitiated: false,
+      isConsultInitiatedAndAccepted: false,
+      isConsultInitiatedOrAccepted: false,
+      isConsultReceived: false,
+      isHeld: false,
+      consultCallHeld: false,
     };
 
-    expect(getControlsVisibility(deviceType, featureFlags, task)).toEqual(expectedControls);
+    expect(getControlsVisibility(deviceType, featureFlags, task, 'agent1', false)).toEqual(expectedControls);
   });
 
   it('should show correct controls when station logis is BROWSER, all flags are enabled and media type is email', () => {
@@ -207,21 +330,36 @@ describe('getControlsVisibility', () => {
     task.data.interaction.mediaType = 'email';
 
     const expectedControls = {
-      accept: true,
-      decline: false,
-      end: true,
-      muteUnmute: false,
-      holdResume: false,
-      consult: false,
-      transfer: true,
-      conference: false,
-      wrapup: false,
-      pauseResumeRecording: false,
-      endConsult: false,
-      recordingIndicator: false,
+      accept: {isVisible: true, isEnabled: true},
+      decline: {isVisible: false, isEnabled: true},
+      end: {isVisible: true, isEnabled: true},
+      muteUnmute: {isVisible: false, isEnabled: true},
+      muteUnmuteConsult: {isVisible: false, isEnabled: true},
+      holdResume: {isVisible: false, isEnabled: true},
+      consult: {isVisible: false, isEnabled: true},
+      transfer: {isVisible: true, isEnabled: true},
+      conference: {isVisible: false, isEnabled: true},
+      wrapup: {isVisible: false, isEnabled: true},
+      pauseResumeRecording: {isVisible: false, isEnabled: true},
+      endConsult: {isVisible: false, isEnabled: true},
+      consultTransfer: {isVisible: false, isEnabled: false},
+      mergeConference: {isVisible: false, isEnabled: false},
+      mergeConferenceConsult: {isVisible: false, isEnabled: false}, // Not enabled when consult not accepted
+      consultTransferConsult: {isVisible: false, isEnabled: false}, // Not enabled when consult not accepted
+      switchToMainCall: {isVisible: false, isEnabled: false},
+      switchToConsult: {isVisible: false, isEnabled: true},
+      exitConference: {isVisible: false, isEnabled: true},
+      recordingIndicator: {isVisible: false, isEnabled: true},
+      isConferenceInProgress: false,
+      isConsultInitiated: false,
+      isConsultInitiatedAndAccepted: false,
+      isConsultInitiatedOrAccepted: false,
+      isConsultReceived: false,
+      isHeld: false,
+      consultCallHeld: false,
     };
 
-    expect(getControlsVisibility(deviceType, featureFlags, task)).toEqual(expectedControls);
+    expect(getControlsVisibility(deviceType, featureFlags, task, 'agent1', false)).toEqual(expectedControls);
   });
 
   it('should handle errors when accessing featureFlags and return safe defaults', () => {
@@ -243,7 +381,7 @@ describe('getControlsVisibility', () => {
       }
     );
 
-    const result = getControlsVisibility(deviceType, problematicFeatureFlags, mockTask, logger);
+    const result = getControlsVisibility(deviceType, problematicFeatureFlags, mockTask, 'agent1', false, logger);
 
     expect(logger.error).toHaveBeenCalledWith(
       'CC-Widgets: Task: Error in getControlsVisibility - FeatureFlags access error',
@@ -254,18 +392,33 @@ describe('getControlsVisibility', () => {
     );
 
     expect(result).toEqual({
-      accept: false,
-      decline: false,
-      end: false,
-      muteUnmute: false,
-      holdResume: false,
-      consult: false,
-      transfer: false,
-      conference: false,
-      wrapup: false,
-      pauseResumeRecording: false,
-      endConsult: false,
-      recordingIndicator: false,
+      accept: {isVisible: false, isEnabled: false},
+      decline: {isVisible: false, isEnabled: false},
+      end: {isVisible: false, isEnabled: false},
+      muteUnmute: {isVisible: false, isEnabled: false},
+      muteUnmuteConsult: {isVisible: false, isEnabled: false},
+      holdResume: {isVisible: false, isEnabled: false},
+      consult: {isVisible: false, isEnabled: false},
+      transfer: {isVisible: false, isEnabled: false},
+      conference: {isVisible: false, isEnabled: false},
+      wrapup: {isVisible: false, isEnabled: true},
+      pauseResumeRecording: {isVisible: false, isEnabled: false},
+      endConsult: {isVisible: false, isEnabled: false},
+      consultTransfer: {isVisible: false, isEnabled: false},
+      mergeConference: {isVisible: false, isEnabled: false},
+      mergeConferenceConsult: {isVisible: false, isEnabled: false},
+      consultTransferConsult: {isVisible: false, isEnabled: false},
+      switchToMainCall: {isVisible: false, isEnabled: false},
+      switchToConsult: {isVisible: false, isEnabled: false},
+      exitConference: {isVisible: false, isEnabled: false},
+      recordingIndicator: {isVisible: false, isEnabled: false},
+      isConferenceInProgress: false,
+      isConsultInitiated: false,
+      isConsultInitiatedAndAccepted: false,
+      isConsultInitiatedOrAccepted: false,
+      isConsultReceived: false,
+      isHeld: false,
+      consultCallHeld: false,
     });
   });
 });
@@ -277,7 +430,7 @@ describe('findHoldTimestamp', () => {
         main: {mType: 'mainCall', holdTimestamp: 123456},
         aux: {mType: 'auxCall', holdTimestamp: 654321},
       },
-    };
+    } as unknown as Interaction;
     expect(findHoldTimestamp(interaction, 'mainCall')).toBe(123456);
     expect(findHoldTimestamp(interaction, 'auxCall')).toBe(654321);
   });
@@ -287,7 +440,7 @@ describe('findHoldTimestamp', () => {
       media: {
         main: {mType: 'mainCall', holdTimestamp: 123456},
       },
-    };
+    } as unknown as Interaction;
     expect(findHoldTimestamp(interaction, 'otherCall')).toBeNull();
   });
 
@@ -296,12 +449,12 @@ describe('findHoldTimestamp', () => {
       media: {
         main: {mType: 'mainCall'},
       },
-    };
+    } as unknown as Interaction;
     expect(findHoldTimestamp(interaction, 'mainCall')).toBeNull();
   });
 
   it('returns null if media is missing', () => {
-    const interaction = {};
+    const interaction = {} as unknown as Interaction;
     expect(findHoldTimestamp(interaction, 'mainCall')).toBeNull();
   });
 
@@ -310,7 +463,7 @@ describe('findHoldTimestamp', () => {
       media: {
         main: {mType: 'mainCall', holdTimestamp: 0},
       },
-    };
+    } as unknown as Interaction;
     expect(findHoldTimestamp(interaction, 'mainCall')).toBe(0);
   });
 
@@ -320,38 +473,492 @@ describe('findHoldTimestamp', () => {
         main: {mType: 'mainCall', holdTimestamp: 42, foo: 'bar'},
       },
       extra: 123,
-    };
+    } as unknown as Interaction;
     expect(findHoldTimestamp(interaction, 'mainCall')).toBe(42);
   });
+});
 
-  it('should handle errors when accessing interaction media and return null', () => {
-    const logger = {
-      error: jest.fn(),
-      log: jest.fn(),
-      warn: jest.fn(),
-      info: jest.fn(),
-      trace: jest.fn(),
-    };
-    // Create a problematic interaction that throws when accessing media
-    const problematicInteraction = new Proxy(
-      {},
-      {
-        get: (target, prop) => {
-          if (prop === 'media') {
-            throw new Error('Media access error');
-          }
-          return target[prop];
+describe('getIsConferenceInProgress', () => {
+  it('should return false when task data is missing', () => {
+    const task = {} as Partial<ITask> as ITask;
+    expect(getIsConferenceInProgress(task)).toBe(false);
+  });
+
+  it('should return false when interaction media is missing', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({}),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(false);
+  });
+
+  it('should return false when interactionId is missing', () => {
+    const task = createMockTask({
+      interaction: createPartialInteraction({
+        media: {},
+      }),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(false);
+  });
+
+  it('should return false when there are no participants', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: [],
+          },
         },
-      }
+        participants: {},
+      }),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(false);
+  });
+
+  it('should return false when there is only one agent participant', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(false);
+  });
+
+  it('should return true when there are two or more agent participants', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(true);
+  });
+
+  it('should exclude customer participants from agent count', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'customer1'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+          customer1: {
+            id: 'customer1',
+            pType: 'Customer',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(false);
+  });
+
+  it('should exclude supervisor participants from agent count', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'supervisor1'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+          supervisor1: {
+            id: 'supervisor1',
+            pType: 'Supervisor',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(false);
+  });
+
+  it('should exclude VVA participants from agent count', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'vva1'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+          vva1: {
+            id: 'vva1',
+            pType: 'VVA',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(false);
+  });
+
+  it('should exclude participants who have left from agent count', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            hasLeft: true,
+          },
+        },
+      }),
+    });
+    expect(getIsConferenceInProgress(task)).toBe(false);
+  });
+});
+
+describe('getConferenceParticipants', () => {
+  const currentAgentId = 'agent1';
+
+  it('should return empty array when task data is missing', () => {
+    const task = {} as Partial<ITask> as ITask;
+    expect(getConferenceParticipants(task, currentAgentId)).toEqual([]);
+  });
+
+  it('should return empty array when interaction media is missing', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({}),
+    });
+    expect(getConferenceParticipants(task, currentAgentId)).toEqual([]);
+  });
+
+  it('should return empty array when interactionId is missing', () => {
+    const task = createMockTask({
+      interaction: createPartialInteraction({
+        media: {},
+      }),
+    });
+    expect(getConferenceParticipants(task, currentAgentId)).toEqual([]);
+  });
+
+  it('should return empty array when there are no participants', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: [],
+          },
+        },
+        participants: {},
+      }),
+    });
+    expect(getConferenceParticipants(task, currentAgentId)).toEqual([]);
+  });
+
+  it('should return list of agent participants excluding current agent', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2', 'agent3'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            name: 'Agent One',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            name: 'Agent Two',
+            hasLeft: false,
+          },
+          agent3: {
+            id: 'agent3',
+            pType: 'Agent',
+            name: 'Agent Three',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+
+    const result = getConferenceParticipants(task, currentAgentId);
+
+    expect(result).toHaveLength(2);
+    expect(result).toContainEqual({
+      id: 'agent2',
+      pType: 'Agent',
+      name: 'Agent Two',
+    });
+    expect(result).toContainEqual({
+      id: 'agent3',
+      pType: 'Agent',
+      name: 'Agent Three',
+    });
+    expect(result).not.toContainEqual(
+      expect.objectContaining({
+        id: 'agent1',
+      })
     );
+  });
 
-    const result = findHoldTimestamp(problematicInteraction, 'mainCall', logger);
+  it('should exclude customer participants', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2', 'customer1'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            name: 'Agent One',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            name: 'Agent Two',
+            hasLeft: false,
+          },
+          customer1: {
+            id: 'customer1',
+            pType: 'Customer',
+            name: 'Customer One',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+
+    const result = getConferenceParticipants(task, currentAgentId);
 
-    expect(logger.error).toHaveBeenCalledWith('CC-Widgets: Task: Error in findHoldTimestamp - Media access error', {
-      module: 'task-util',
-      method: 'findHoldTimestamp',
+    expect(result).toHaveLength(1);
+    expect(result).toContainEqual({
+      id: 'agent2',
+      pType: 'Agent',
+      name: 'Agent Two',
     });
+  });
 
-    expect(result).toBeNull();
+  it('should exclude supervisor participants', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2', 'supervisor1'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            name: 'Agent One',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            name: 'Agent Two',
+            hasLeft: false,
+          },
+          supervisor1: {
+            id: 'supervisor1',
+            pType: 'Supervisor',
+            name: 'Supervisor One',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+
+    const result = getConferenceParticipants(task, currentAgentId);
+
+    expect(result).toHaveLength(1);
+    expect(result).toContainEqual({
+      id: 'agent2',
+      pType: 'Agent',
+      name: 'Agent Two',
+    });
+  });
+
+  it('should exclude VVA participants', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2', 'vva1'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            name: 'Agent One',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            name: 'Agent Two',
+            hasLeft: false,
+          },
+          vva1: {
+            id: 'vva1',
+            pType: 'VVA',
+            name: 'VVA One',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+
+    const result = getConferenceParticipants(task, currentAgentId);
+
+    expect(result).toHaveLength(1);
+    expect(result).toContainEqual({
+      id: 'agent2',
+      pType: 'Agent',
+      name: 'Agent Two',
+    });
+  });
+
+  it('should exclude participants who have left', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2', 'agent3'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            name: 'Agent One',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            name: 'Agent Two',
+            hasLeft: false,
+          },
+          agent3: {
+            id: 'agent3',
+            pType: 'Agent',
+            name: 'Agent Three',
+            hasLeft: true,
+          },
+        },
+      }),
+    });
+
+    const result = getConferenceParticipants(task, currentAgentId);
+
+    expect(result).toHaveLength(1);
+    expect(result).toContainEqual({
+      id: 'agent2',
+      pType: 'Agent',
+      name: 'Agent Two',
+    });
+  });
+
+  it('should handle participants without names', () => {
+    const task = createMockTask({
+      interactionId: 'main',
+      interaction: createPartialInteraction({
+        media: {
+          main: {
+            participants: ['agent1', 'agent2'],
+          },
+        },
+        participants: {
+          agent1: {
+            id: 'agent1',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+          agent2: {
+            id: 'agent2',
+            pType: 'Agent',
+            hasLeft: false,
+          },
+        },
+      }),
+    });
+
+    const result = getConferenceParticipants(task, currentAgentId);
+
+    expect(result).toHaveLength(1);
+    expect(result).toContainEqual({
+      id: 'agent2',
+      pType: 'Agent',
+      name: 'agent2',
+    });
   });
 });
diff --git a/packages/contact-center/test-fixtures/src/fixtures.ts b/packages/contact-center/test-fixtures/src/fixtures.ts
index 0bf0839ac..33b88dbdb 100644
--- a/packages/contact-center/test-fixtures/src/fixtures.ts
+++ b/packages/contact-center/test-fixtures/src/fixtures.ts
@@ -114,14 +114,53 @@ const mockTask: ITask = {
   data: {
     interaction: {
       mediaType: 'telephony',
+      state: 'connected',
+      interactionId: 'interaction123',
+      callProcessingDetails: {
+        relationshipType: 'primary',
+        parentInteractionId: null,
+      },
       participants: {
         agent1: {
           hasJoined: true,
+          pType: 'Agent',
+          id: 'agent1',
+          name: 'agent1',
+          hasLeft: false,
+        },
+        customer1: {
+          hasJoined: true,
+          pType: 'Customer',
+          id: 'customer1',
+          name: 'customer1',
+          hasLeft: false,
+        },
+      },
+      media: {
+        interaction123: {
+          mType: 'main',
+          isHold: false,
+          participants: ['agent1', 'customer1'],
         },
       },
     },
     agentId: 'agent1',
-  } as TaskData,
+    isConferenceInProgress: false,
+    wrapUpRequired: false,
+    mediaResourceId: 'interaction123',
+    interactionId: 'interaction123',
+    eventType: 'TASK_UPDATE',
+    destAgentId: '',
+    trackingId: 'tracking123',
+    orgId: 'org123',
+    teamId: 'team1',
+    channelType: 'telephony',
+    consultMediaResourceId: null,
+    owner: 'agent1',
+    queueMgr: 'queue-mgr-1',
+    type: 'TASK',
+    isConferencing: false,
+  } as unknown as TaskData,
   webCallMap: {},
   autoWrapup: undefined,
   on: jest.fn(),
@@ -150,11 +189,14 @@ const mockTask: ITask = {
   wrapup: jest.fn().mockResolvedValue({} as TaskResponse),
   pauseRecording: jest.fn().mockResolvedValue({} as TaskResponse),
   resumeRecording: jest.fn().mockResolvedValue({} as TaskResponse),
-  //@ts-expect-error  To be fixed in SDK - https://jira-eng-sjc12.cisco.com/jira/browse/CAI-6762
   consult: jest.fn().mockResolvedValue({} as TaskResponse),
   transfer: jest.fn().mockResolvedValue({} as TaskResponse),
   consultTransfer: jest.fn().mockResolvedValue({} as TaskResponse),
   endConsult: jest.fn().mockResolvedValue({} as TaskResponse),
+  consultConference: jest.fn(),
+  transferConference: jest.fn(),
+  exitConference: jest.fn(),
+  toggleMute: jest.fn(),
 };
 
 const mockQueueDetails = [
diff --git a/yarn.lock b/yarn.lock
index c55e8071a..ab23861fe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9265,21 +9265,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webex/calling@npm:3.9.0-next.10":
-  version: 3.9.0-next.10
-  resolution: "@webex/calling@npm:3.9.0-next.10"
+"@webex/calling@npm:3.10.0-next.5":
+  version: 3.10.0-next.5
+  resolution: "@webex/calling@npm:3.10.0-next.5"
   dependencies:
     "@types/platform": "npm:1.3.4"
-    "@webex/internal-media-core": "npm:2.19.0"
-    "@webex/internal-plugin-metrics": "npm:3.9.0-next.3"
-    "@webex/media-helpers": "npm:3.9.0-next.1"
+    "@webex/internal-media-core": "npm:2.20.1"
+    "@webex/internal-plugin-metrics": "npm:3.10.0-next.1"
+    "@webex/media-helpers": "npm:3.10.0-next.1"
     async-mutex: "npm:0.4.0"
     buffer: "npm:6.0.3"
     jest-html-reporters: "npm:3.0.11"
     platform: "npm:1.3.6"
     uuid: "npm:8.3.2"
     xstate: "npm:4.30.6"
-  checksum: 10c0/d1d1a203b1172c672e6d13ec29e2224356a59c740514e579c090850cdc756cb3394d1034d95f719b2ae4d0228743afb4e5080a44cba08bbb38ce8b7c8bc94b14
+  checksum: 10c0/759ca8bac8d5ca708ec588bf2192235418a2ac24e5bd8524cc57fa962427354679172cea56922cbb6fe5dec02f3c9703cc59aa3c9e33eceb36583c4f6524c4d2
   languageName: node
   linkType: hard
 
@@ -9409,7 +9409,7 @@ __metadata:
     "@testing-library/react": "npm:16.0.1"
     "@types/jest": "npm:29.5.14"
     "@types/react-test-renderer": "npm:18"
-    "@webex/contact-center": "npm:3.9.0-next.18"
+    "@webex/contact-center": "npm:3.10.0-next.8"
     "@webex/test-fixtures": "workspace:*"
     babel-jest: "npm:29.7.0"
     babel-loader: "npm:9.2.1"
@@ -9726,30 +9726,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webex/contact-center@npm:3.9.0-next.16":
-  version: 3.9.0-next.16
-  resolution: "@webex/contact-center@npm:3.9.0-next.16"
+"@webex/contact-center@npm:3.10.0-next.8":
+  version: 3.10.0-next.8
+  resolution: "@webex/contact-center@npm:3.10.0-next.8"
   dependencies:
     "@types/platform": "npm:1.3.4"
-    "@webex/calling": "npm:3.9.0-next.8"
-    "@webex/internal-plugin-mercury": "npm:3.9.0-next.3"
-    "@webex/internal-plugin-metrics": "npm:3.9.0-next.3"
-    "@webex/internal-plugin-support": "npm:3.9.0-next.5"
-    "@webex/plugin-authorization": "npm:3.9.0-next.3"
-    "@webex/plugin-logger": "npm:3.9.0-next.3"
-    "@webex/webex-core": "npm:3.9.0-next.3"
+    "@webex/calling": "npm:3.10.0-next.5"
+    "@webex/internal-plugin-mercury": "npm:3.10.0-next.1"
+    "@webex/internal-plugin-metrics": "npm:3.10.0-next.1"
+    "@webex/internal-plugin-support": "npm:3.10.0-next.1"
+    "@webex/plugin-authorization": "npm:3.10.0-next.1"
+    "@webex/plugin-logger": "npm:3.10.0-next.1"
+    "@webex/webex-core": "npm:3.10.0-next.1"
     jest-html-reporters: "npm:3.0.11"
     lodash: "npm:^4.17.21"
-  checksum: 10c0/da622b76934df5f280c02b566f84ae82faf6dcd490d43cd0f1367338713fa6c8fa70d8b98c4d5f7fd45080a009cca0d4072b81227cf8c0843f010722f85f6bfc
+  checksum: 10c0/c2c7e64b5788a62b3f4644ffa8355d068248fc9a73c1231e21e3404aa4d433736a2dde2ba0dc9b78e7cfbea022183eb1b074134d1fddff4a6b287aeccd8c6fee
   languageName: node
   linkType: hard
 
-"@webex/contact-center@npm:3.9.0-next.18":
-  version: 3.9.0-next.18
-  resolution: "@webex/contact-center@npm:3.9.0-next.18"
+"@webex/contact-center@npm:3.9.0-next.16":
+  version: 3.9.0-next.16
+  resolution: "@webex/contact-center@npm:3.9.0-next.16"
   dependencies:
     "@types/platform": "npm:1.3.4"
-    "@webex/calling": "npm:3.9.0-next.10"
+    "@webex/calling": "npm:3.9.0-next.8"
     "@webex/internal-plugin-mercury": "npm:3.9.0-next.3"
     "@webex/internal-plugin-metrics": "npm:3.9.0-next.3"
     "@webex/internal-plugin-support": "npm:3.9.0-next.5"
@@ -9758,7 +9758,7 @@ __metadata:
     "@webex/webex-core": "npm:3.9.0-next.3"
     jest-html-reporters: "npm:3.0.11"
     lodash: "npm:^4.17.21"
-  checksum: 10c0/ba6e06d9fb3bda054dd311627b63a5f70b9b2c04847741a3fdc45febe1496c0a453c810a9a7ed3c9fd1fd0baab03901dcc08c3e4815083c02c2f5efe6713b4f1
+  checksum: 10c0/da622b76934df5f280c02b566f84ae82faf6dcd490d43cd0f1367338713fa6c8fa70d8b98c4d5f7fd45080a009cca0d4072b81227cf8c0843f010722f85f6bfc
   languageName: node
   linkType: hard
 
@@ -9970,6 +9970,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/internal-media-core@npm:2.20.1":
+  version: 2.20.1
+  resolution: "@webex/internal-media-core@npm:2.20.1"
+  dependencies:
+    "@babel/runtime": "npm:^7.18.9"
+    "@babel/runtime-corejs2": "npm:^7.25.0"
+    "@webex/rtcstats": "npm:^1.5.5"
+    "@webex/ts-sdp": "npm:1.8.2"
+    "@webex/web-capabilities": "npm:^1.7.1"
+    "@webex/web-client-media-engine": "npm:3.35.0"
+    events: "npm:^3.3.0"
+    ip-anonymize: "npm:^0.1.0"
+    typed-emitter: "npm:^2.1.0"
+    uuid: "npm:^8.3.2"
+    webrtc-adapter: "npm:^8.1.2"
+    xstate: "npm:^4.30.6"
+  checksum: 10c0/d63f194bcd937b530b1a9e5217e7ddbede5c43fd1026495ab39ca48af75cc7dbf60c7b92b7d8e2f2c3b06318b847c6cfc08d18de63cf726e0b5aff64a0f46da2
+  languageName: node
+  linkType: hard
+
 "@webex/internal-plugin-calendar@npm:2.60.2":
   version: 2.60.2
   resolution: "@webex/internal-plugin-calendar@npm:2.60.2"
@@ -10048,6 +10068,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/internal-plugin-conversation@npm:3.10.0-next.1":
+  version: 3.10.0-next.1
+  resolution: "@webex/internal-plugin-conversation@npm:3.10.0-next.1"
+  dependencies:
+    "@webex/common": "npm:3.8.1-next.11"
+    "@webex/helper-html": "npm:3.8.1-next.11"
+    "@webex/helper-image": "npm:3.8.1-next.11"
+    "@webex/internal-plugin-encryption": "npm:3.10.0-next.1"
+    "@webex/internal-plugin-user": "npm:3.10.0-next.1"
+    "@webex/webex-core": "npm:3.10.0-next.1"
+    crypto-js: "npm:^4.1.1"
+    lodash: "npm:^4.17.21"
+    node-scr: "npm:^0.3.0"
+    uuid: "npm:^3.3.2"
+  checksum: 10c0/1dc2cf27f049f7d2ddeec0e873aaf3b0941a346f044e13acf330d9406e9e99c462a694e3bb44388c372a22c8256142311aa7fefce58d2279a4f6c128b7ba3ab1
+  languageName: node
+  linkType: hard
+
 "@webex/internal-plugin-conversation@npm:3.9.0-next.4":
   version: 3.9.0-next.4
   resolution: "@webex/internal-plugin-conversation@npm:3.9.0-next.4"
@@ -10098,6 +10136,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/internal-plugin-device@npm:3.10.0-next.1":
+  version: 3.10.0-next.1
+  resolution: "@webex/internal-plugin-device@npm:3.10.0-next.1"
+  dependencies:
+    "@webex/common": "npm:3.8.1-next.11"
+    "@webex/common-timers": "npm:3.8.1-next.11"
+    "@webex/http-core": "npm:3.8.1-next.11"
+    "@webex/internal-plugin-metrics": "npm:3.10.0-next.1"
+    "@webex/webex-core": "npm:3.10.0-next.1"
+    ampersand-collection: "npm:^2.0.2"
+    ampersand-state: "npm:^5.0.3"
+    lodash: "npm:^4.17.21"
+    uuid: "npm:^3.3.2"
+  checksum: 10c0/e5551e1dbc54e2237dd211ec016763a5a67c07df6934b355be7be674f9edffabd8845ab6807dd5ab2a09885f4b8ad16d61a1a09c15c56ee95dc923cb015f2857
+  languageName: node
+  linkType: hard
+
 "@webex/internal-plugin-device@npm:3.9.0-next.3":
   version: 3.9.0-next.3
   resolution: "@webex/internal-plugin-device@npm:3.9.0-next.3"
@@ -10181,6 +10236,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/internal-plugin-encryption@npm:3.10.0-next.1":
+  version: 3.10.0-next.1
+  resolution: "@webex/internal-plugin-encryption@npm:3.10.0-next.1"
+  dependencies:
+    "@webex/common": "npm:3.8.1-next.11"
+    "@webex/common-timers": "npm:3.8.1-next.11"
+    "@webex/http-core": "npm:3.8.1-next.11"
+    "@webex/internal-plugin-device": "npm:3.10.0-next.1"
+    "@webex/internal-plugin-mercury": "npm:3.10.0-next.1"
+    "@webex/test-helper-file": "npm:3.8.1-next.11"
+    "@webex/webex-core": "npm:3.10.0-next.1"
+    asn1js: "npm:^2.0.26"
+    debug: "npm:^4.3.4"
+    isomorphic-webcrypto: "npm:^2.3.8"
+    lodash: "npm:^4.17.21"
+    node-jose: "npm:^2.2.0"
+    node-kms: "npm:^0.4.1"
+    node-scr: "npm:^0.3.0"
+    pkijs: "npm:^2.1.84"
+    safe-buffer: "npm:^5.2.0"
+    uuid: "npm:^3.3.2"
+    valid-url: "npm:^1.0.9"
+  checksum: 10c0/3c528df90baac8975a5a7b77dcef77b0469cae70ccde0e2387962b1d4f1ca47c79fbc09e20ad48196931c6c260fec398758ab42597ad5e921e52b107f9880fba
+  languageName: node
+  linkType: hard
+
 "@webex/internal-plugin-encryption@npm:3.9.0-next.4":
   version: 3.9.0-next.4
   resolution: "@webex/internal-plugin-encryption@npm:3.9.0-next.4"
@@ -10231,6 +10312,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/internal-plugin-feature@npm:3.10.0-next.1":
+  version: 3.10.0-next.1
+  resolution: "@webex/internal-plugin-feature@npm:3.10.0-next.1"
+  dependencies:
+    "@webex/internal-plugin-device": "npm:3.10.0-next.1"
+    "@webex/webex-core": "npm:3.10.0-next.1"
+    lodash: "npm:^4.17.21"
+  checksum: 10c0/9747d519392381fcb414528b4a4546492ef3953af8a13a302e376e9e0e9d6f2628b033259e7f1d85f03ea535198a8b563a8f0fc43d97801d6a5a7c71a6725ac1
+  languageName: node
+  linkType: hard
+
 "@webex/internal-plugin-feature@npm:3.9.0-next.3":
   version: 3.9.0-next.3
   resolution: "@webex/internal-plugin-feature@npm:3.9.0-next.3"
@@ -10392,6 +10484,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/internal-plugin-mercury@npm:3.10.0-next.1":
+  version: 3.10.0-next.1
+  resolution: "@webex/internal-plugin-mercury@npm:3.10.0-next.1"
+  dependencies:
+    "@webex/common": "npm:3.8.1-next.11"
+    "@webex/common-timers": "npm:3.8.1-next.11"
+    "@webex/internal-plugin-device": "npm:3.10.0-next.1"
+    "@webex/internal-plugin-feature": "npm:3.10.0-next.1"
+    "@webex/internal-plugin-metrics": "npm:3.10.0-next.1"
+    "@webex/test-helper-chai": "npm:3.8.1-next.11"
+    "@webex/test-helper-mocha": "npm:3.8.1-next.11"
+    "@webex/test-helper-mock-web-socket": "npm:3.8.1-next.11"
+    "@webex/test-helper-mock-webex": "npm:3.8.1-next.11"
+    "@webex/test-helper-refresh-callback": "npm:3.8.1-next.11"
+    "@webex/test-helper-test-users": "npm:3.8.1-next.11"
+    "@webex/webex-core": "npm:3.10.0-next.1"
+    backoff: "npm:^2.5.0"
+    lodash: "npm:^4.17.21"
+    uuid: "npm:^3.3.2"
+    ws: "npm:^8.17.1"
+  checksum: 10c0/e81ef24c61efe6e1235632a298cb063d61f0d27f01878b8849ef2a60c202e7fd2e50d08ecf9ef62436681639e77a660c118ab655341fc67b198c0a31f50616ff
+  languageName: node
+  linkType: hard
+
 "@webex/internal-plugin-mercury@npm:3.9.0-next.3":
   version: 3.9.0-next.3
   resolution: "@webex/internal-plugin-mercury@npm:3.9.0-next.3"
@@ -10442,6 +10558,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/internal-plugin-metrics@npm:3.10.0-next.1":
+  version: 3.10.0-next.1
+  resolution: "@webex/internal-plugin-metrics@npm:3.10.0-next.1"
+  dependencies:
+    "@webex/common": "npm:3.8.1-next.11"
+    "@webex/common-timers": "npm:3.8.1-next.11"
+    "@webex/event-dictionary-ts": "npm:^1.0.1930"
+    "@webex/test-helper-chai": "npm:3.8.1-next.11"
+    "@webex/test-helper-mock-webex": "npm:3.8.1-next.11"
+    "@webex/webex-core": "npm:3.10.0-next.1"
+    ip-anonymize: "npm:^0.1.0"
+    lodash: "npm:^4.17.21"
+    uuid: "npm:^3.3.2"
+  checksum: 10c0/f73dbb4ea3b035ca29429fd6d974e4c4924de61a6aa7ed352059a71287894b86e0c64f360f357e5c0f39282b8a93076830ff62b4eacccccd7845e8147d382016
+  languageName: node
+  linkType: hard
+
 "@webex/internal-plugin-metrics@npm:3.9.0-next.3":
   version: 3.9.0-next.3
   resolution: "@webex/internal-plugin-metrics@npm:3.9.0-next.3"
@@ -10537,6 +10670,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/internal-plugin-search@npm:3.10.0-next.1":
+  version: 3.10.0-next.1
+  resolution: "@webex/internal-plugin-search@npm:3.10.0-next.1"
+  dependencies:
+    "@webex/common": "npm:3.8.1-next.11"
+    "@webex/internal-plugin-conversation": "npm:3.10.0-next.1"
+    "@webex/internal-plugin-device": "npm:3.10.0-next.1"
+    "@webex/internal-plugin-encryption": "npm:3.10.0-next.1"
+    "@webex/webex-core": "npm:3.10.0-next.1"
+    lodash: "npm:^4.17.21"
+    uuid: "npm:^3.3.2"
+  checksum: 10c0/9ff20807d49e73461062eca6a0c0d4ad0df1e228d44586f0e9fe9613dd766f855456e1fc681c9d45113f628c9260802d9eb3425dd01be02e0b85c9edf93de36b
+  languageName: node
+  linkType: hard
+
 "@webex/internal-plugin-search@npm:3.9.0-next.4":
   version: 3.9.0-next.4
   resolution: "@webex/internal-plugin-search@npm:3.9.0-next.4"
@@ -10586,6 +10734,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/internal-plugin-support@npm:3.10.0-next.1":
+  version: 3.10.0-next.1
+  resolution: "@webex/internal-plugin-support@npm:3.10.0-next.1"
+  dependencies:
+    "@webex/internal-plugin-device": "npm:3.10.0-next.1"
+    "@webex/internal-plugin-search": "npm:3.10.0-next.1"
+    "@webex/test-helper-chai": "npm:3.8.1-next.11"
+    "@webex/test-helper-file": "npm:3.8.1-next.11"
+    "@webex/test-helper-mock-webex": "npm:3.8.1-next.11"
+    "@webex/test-helper-test-users": "npm:3.8.1-next.11"
+    "@webex/webex-core": "npm:3.10.0-next.1"
+    lodash: "npm:^4.17.21"
+    uuid: "npm:^3.3.2"
+  checksum: 10c0/ff73af0fe2b05a1a1b0b45a7626a300a5e1d6bed8bae8e11284158ef7b2a72624284081d55a5f894b22e899103211a0d1f73f8cc6c039707d3c511d274af9806
+  languageName: node
+  linkType: hard
+
 "@webex/internal-plugin-support@npm:3.9.0-next.5":
   version: 3.9.0-next.5
   resolution: "@webex/internal-plugin-support@npm:3.9.0-next.5"
@@ -10635,6 +10800,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/internal-plugin-user@npm:3.10.0-next.1":
+  version: 3.10.0-next.1
+  resolution: "@webex/internal-plugin-user@npm:3.10.0-next.1"
+  dependencies:
+    "@webex/common": "npm:3.8.1-next.11"
+    "@webex/internal-plugin-device": "npm:3.10.0-next.1"
+    "@webex/test-helper-chai": "npm:3.8.1-next.11"
+    "@webex/test-helper-mock-webex": "npm:3.8.1-next.11"
+    "@webex/test-helper-test-users": "npm:3.8.1-next.11"
+    "@webex/webex-core": "npm:3.10.0-next.1"
+    lodash: "npm:^4.17.21"
+    uuid: "npm:^3.3.2"
+  checksum: 10c0/7990f886d3e46cb4355a15494f26ccd1f340c103315f6b2ef80a95e85450fd0fc572e62e428f556caf3816f58d94b4a102d4bec79c202179d4072d250b0f907a
+  languageName: node
+  linkType: hard
+
 "@webex/internal-plugin-user@npm:3.9.0-next.3":
   version: 3.9.0-next.3
   resolution: "@webex/internal-plugin-user@npm:3.9.0-next.3"
@@ -10670,28 +10851,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webex/ladon-ts@npm:^5.5.1":
-  version: 5.5.1
-  resolution: "@webex/ladon-ts@npm:5.5.1"
+"@webex/ladon-ts@npm:^5.10.0, @webex/ladon-ts@npm:^5.7.1":
+  version: 5.10.0
+  resolution: "@webex/ladon-ts@npm:5.10.0"
   dependencies:
     "@rollup/rollup-linux-x64-gnu": "npm:4.36.0"
+    js-logger: "npm:^1.6.1"
   dependenciesMeta:
     "@rollup/rollup-linux-x64-gnu":
       optional: true
-  checksum: 10c0/202da7c94dc2e814f5c59deefc0fb286ebeedc573cef2b9cdfae8be809d17e020280fbf47f57be3bdf5b9346a2dd71ea960169a5e67f5525d61d01bc8569613c
+  checksum: 10c0/2b16be784f428f443e0a380a5717255146177714477f70fab1d3b0c95ebf78b68544bfdcdcf87ec672d9e9e5add074906a9e632963cbda96e897f98f16f792dc
   languageName: node
   linkType: hard
 
-"@webex/ladon-ts@npm:^5.7.1":
-  version: 5.10.0
-  resolution: "@webex/ladon-ts@npm:5.10.0"
+"@webex/ladon-ts@npm:^5.5.1":
+  version: 5.5.1
+  resolution: "@webex/ladon-ts@npm:5.5.1"
   dependencies:
     "@rollup/rollup-linux-x64-gnu": "npm:4.36.0"
-    js-logger: "npm:^1.6.1"
   dependenciesMeta:
     "@rollup/rollup-linux-x64-gnu":
       optional: true
-  checksum: 10c0/2b16be784f428f443e0a380a5717255146177714477f70fab1d3b0c95ebf78b68544bfdcdcf87ec672d9e9e5add074906a9e632963cbda96e897f98f16f792dc
+  checksum: 10c0/202da7c94dc2e814f5c59deefc0fb286ebeedc573cef2b9cdfae8be809d17e020280fbf47f57be3bdf5b9346a2dd71ea960169a5e67f5525d61d01bc8569613c
+  languageName: node
+  linkType: hard
+
+"@webex/media-helpers@npm:3.10.0-next.1":
+  version: 3.10.0-next.1
+  resolution: "@webex/media-helpers@npm:3.10.0-next.1"
+  dependencies:
+    "@webex/internal-media-core": "npm:2.20.1"
+    "@webex/ts-events": "npm:^1.1.0"
+    "@webex/web-media-effects": "npm:2.32.1"
+  checksum: 10c0/b94cfe91d462a2e94d2fe821264fe7c228275c5ba4d7d540307a43ee9e1d9def3a61dca8236d2e38d0f9ccc2978bdc4c397af554b8a9a751a7b75f771b9a3c0f
   languageName: node
   linkType: hard
 
@@ -10796,6 +10988,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/plugin-authorization-browser@npm:3.10.0-next.1":
+  version: 3.10.0-next.1
+  resolution: "@webex/plugin-authorization-browser@npm:3.10.0-next.1"
+  dependencies:
+    "@webex/common": "npm:3.8.1-next.11"
+    "@webex/internal-plugin-device": "npm:3.10.0-next.1"
+    "@webex/plugin-authorization-node": "npm:3.10.0-next.1"
+    "@webex/storage-adapter-local-storage": "npm:3.10.0-next.1"
+    "@webex/storage-adapter-spec": "npm:3.8.1-next.11"
+    "@webex/webex-core": "npm:3.10.0-next.1"
+    jsonwebtoken: "npm:^9.0.2"
+    lodash: "npm:^4.17.21"
+    uuid: "npm:^3.3.2"
+  checksum: 10c0/2d008846a74670e689b39c27541035ded963a09d4cd228e116c5eac470e64c1cb37a244541c5f0b45fc6d5b4e4ebf16c10809dee6d405965a2976b09fc8b9e2b
+  languageName: node
+  linkType: hard
+
 "@webex/plugin-authorization-browser@npm:3.9.0-next.3":
   version: 3.9.0-next.3
   resolution: "@webex/plugin-authorization-browser@npm:3.9.0-next.3"
@@ -10839,6 +11048,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/plugin-authorization-node@npm:3.10.0-next.1":
+  version: 3.10.0-next.1
+  resolution: "@webex/plugin-authorization-node@npm:3.10.0-next.1"
+  dependencies:
+    "@webex/common": "npm:3.8.1-next.11"
+    "@webex/internal-plugin-device": "npm:3.10.0-next.1"
+    "@webex/webex-core": "npm:3.10.0-next.1"
+    jsonwebtoken: "npm:^9.0.0"
+    uuid: "npm:^3.3.2"
+  checksum: 10c0/686da6d8e62ef82ba2b3891b41959da5ff01a7f164050d28ce32a8767cbd786bffd6a4998c1a024a8ff8f8de4b3ccfba3866a29fc7f439deba7b09acac6f4266
+  languageName: node
+  linkType: hard
+
 "@webex/plugin-authorization-node@npm:3.9.0-next.3":
   version: 3.9.0-next.3
   resolution: "@webex/plugin-authorization-node@npm:3.9.0-next.3"
@@ -10872,6 +11094,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/plugin-authorization@npm:3.10.0-next.1":
+  version: 3.10.0-next.1
+  resolution: "@webex/plugin-authorization@npm:3.10.0-next.1"
+  dependencies:
+    "@webex/plugin-authorization-browser": "npm:3.10.0-next.1"
+    "@webex/plugin-authorization-node": "npm:3.10.0-next.1"
+  checksum: 10c0/672c11300d019fa272d065ea5883c819e91fee8d6ae54dd2ce76add490600a561d662b0a687122399fa5e7949ddb235d939fc65a8b82046ad87d059c2cfde4e5
+  languageName: node
+  linkType: hard
+
 "@webex/plugin-authorization@npm:3.9.0-next.3":
   version: 3.9.0-next.3
   resolution: "@webex/plugin-authorization@npm:3.9.0-next.3"
@@ -10974,6 +11206,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/plugin-logger@npm:3.10.0-next.1":
+  version: 3.10.0-next.1
+  resolution: "@webex/plugin-logger@npm:3.10.0-next.1"
+  dependencies:
+    "@webex/common": "npm:3.8.1-next.11"
+    "@webex/test-helper-chai": "npm:3.8.1-next.11"
+    "@webex/test-helper-mocha": "npm:3.8.1-next.11"
+    "@webex/test-helper-mock-webex": "npm:3.8.1-next.11"
+    "@webex/webex-core": "npm:3.10.0-next.1"
+    lodash: "npm:^4.17.21"
+  checksum: 10c0/0225ae991c7ea08486680dc43efe7efe6a557ff27f2daab17198451fc1600254125bd7d2961103c7b36dc1e2261b9b25ff0531d2ffdba2a6a981ab1c2f493716
+  languageName: node
+  linkType: hard
+
 "@webex/plugin-logger@npm:3.9.0-next.3":
   version: 3.9.0-next.3
   resolution: "@webex/plugin-logger@npm:3.9.0-next.3"
@@ -11445,6 +11691,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/storage-adapter-local-storage@npm:3.10.0-next.1":
+  version: 3.10.0-next.1
+  resolution: "@webex/storage-adapter-local-storage@npm:3.10.0-next.1"
+  dependencies:
+    "@webex/storage-adapter-spec": "npm:3.8.1-next.11"
+    "@webex/test-helper-mocha": "npm:3.8.1-next.11"
+    "@webex/webex-core": "npm:3.10.0-next.1"
+  checksum: 10c0/f2e63c17b4bd88c880828d1547761a03514a20672d7f4c1e1d195f05fcdd0d684b800576f53213e2e016ec1e4ad3485f2d29fef9fa994ebdd368662208b07f8c
+  languageName: node
+  linkType: hard
+
 "@webex/storage-adapter-local-storage@npm:3.9.0-next.3":
   version: 3.9.0-next.3
   resolution: "@webex/storage-adapter-local-storage@npm:3.9.0-next.3"
@@ -11895,6 +12152,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/web-capabilities@npm:^1.7.1":
+  version: 1.8.0
+  resolution: "@webex/web-capabilities@npm:1.8.0"
+  dependencies:
+    bowser: "npm:^2.11.0"
+  checksum: 10c0/4746918b207bebe55fed8f3b7a483f52baf5675bff1c0221678aeea1da7f645966c2d35492ac2f66bddeb55b5894361e6ad6b7a90fedc6dec1d5a4932b69f772
+  languageName: node
+  linkType: hard
+
 "@webex/web-client-media-engine@npm:3.34.0":
   version: 3.34.0
   resolution: "@webex/web-client-media-engine@npm:3.34.0"
@@ -11914,6 +12180,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/web-client-media-engine@npm:3.35.0":
+  version: 3.35.0
+  resolution: "@webex/web-client-media-engine@npm:3.35.0"
+  dependencies:
+    "@webex/json-multistream": "npm:^2.3.1"
+    "@webex/rtcstats": "npm:^1.5.5"
+    "@webex/ts-events": "npm:^1.2.1"
+    "@webex/ts-sdp": "npm:1.8.2"
+    "@webex/web-capabilities": "npm:^1.7.1"
+    "@webex/web-media-effects": "npm:2.32.1"
+    "@webex/webrtc-core": "npm:2.13.4"
+    async: "npm:^3.2.4"
+    js-logger: "npm:^1.6.1"
+    typed-emitter: "npm:^2.1.0"
+    uuid: "npm:^8.3.2"
+  checksum: 10c0/2372d5bf38dcf5d50ced592c02eba8a8a6968dcdc6affea2da821f80a7725a9ea4ba3905d92ce711ddf8ec84ebe1204efd9122bff5f42ded9de55026acfe9da5
+  languageName: node
+  linkType: hard
+
 "@webex/web-media-effects@npm:2.27.1":
   version: 2.27.1
   resolution: "@webex/web-media-effects@npm:2.27.1"
@@ -11944,6 +12229,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/web-media-effects@npm:2.32.1":
+  version: 2.32.1
+  resolution: "@webex/web-media-effects@npm:2.32.1"
+  dependencies:
+    "@webex/ladon-ts": "npm:^5.10.0"
+    events: "npm:^3.3.0"
+    js-logger: "npm:^1.6.1"
+    typed-emitter: "npm:^1.4.0"
+    uuid: "npm:^9.0.1"
+    worker-timers: "npm:^8.0.21"
+    yarn: "npm:^1.22.22"
+  checksum: 10c0/84a49ab9b880fc163bfa2098114097704eb69e174ce2e12c43634215e0be1682a7117e008f51b1f56b5370c6576ff905af17ad5ecf8bd280cc1ed2bdf01cde6d
+  languageName: node
+  linkType: hard
+
 "@webex/webex-core@npm:2.60.2":
   version: 2.60.2
   resolution: "@webex/webex-core@npm:2.60.2"
@@ -11988,6 +12288,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/webex-core@npm:3.10.0-next.1":
+  version: 3.10.0-next.1
+  resolution: "@webex/webex-core@npm:3.10.0-next.1"
+  dependencies:
+    "@webex/common": "npm:3.8.1-next.11"
+    "@webex/common-timers": "npm:3.8.1-next.11"
+    "@webex/http-core": "npm:3.8.1-next.11"
+    "@webex/storage-adapter-spec": "npm:3.8.1-next.11"
+    ampersand-collection: "npm:^2.0.2"
+    ampersand-events: "npm:^2.0.2"
+    ampersand-state: "npm:^5.0.3"
+    core-decorators: "npm:^0.20.0"
+    crypto-js: "npm:^4.1.1"
+    jsonwebtoken: "npm:^9.0.0"
+    lodash: "npm:^4.17.21"
+    uuid: "npm:^3.3.2"
+  checksum: 10c0/8783c362c9fd91b07df8769c25471ca063c805baeb14c6558e990bf41f2b1a10301dc62ddcb3df79075a3238a7e098c3d61ebe8b3b19b9573c97427e805fa59f
+  languageName: node
+  linkType: hard
+
 "@webex/webex-core@npm:3.9.0-next.3":
   version: 3.9.0-next.3
   resolution: "@webex/webex-core@npm:3.9.0-next.3"
@@ -12023,6 +12343,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webex/webrtc-core@npm:2.13.4":
+  version: 2.13.4
+  resolution: "@webex/webrtc-core@npm:2.13.4"
+  dependencies:
+    "@webex/ts-events": "npm:^1.2.1"
+    "@webex/web-capabilities": "npm:^1.6.1"
+    "@webex/web-media-effects": "npm:2.32.1"
+    events: "npm:^3.3.0"
+    js-logger: "npm:^1.6.1"
+    typed-emitter: "npm:^2.1.0"
+    webrtc-adapter: "npm:^8.1.2"
+  checksum: 10c0/5c1c06b8828cccda14af719935abfb70737346c4ed9e1f24f088edcffcc5a732928523e369bd82b48991252ea0fcb045b0792021710b6a335eec15510068a7a9
+  languageName: node
+  linkType: hard
+
 "@webex/widgets@workspace:*, @webex/widgets@workspace:packages/@webex/widgets":
   version: 0.0.0-use.local
   resolution: "@webex/widgets@workspace:packages/@webex/widgets"