diff --git a/src/components/NotificationSystem/NotificationSystem.stories.tsx b/src/components/NotificationSystem/NotificationSystem.stories.tsx
index 21635f94e..49f7567e6 100644
--- a/src/components/NotificationSystem/NotificationSystem.stories.tsx
+++ b/src/components/NotificationSystem/NotificationSystem.stories.tsx
@@ -35,7 +35,11 @@ const Example = Template<NotificationSystemProps>((args: NotificationSystemProps
               toastCloseButtonLabel="Close notification"
               aria-label="Some notification"
             />,
-            { notificationSystemId: 'id' }
+            {
+              notificationSystemId: 'id',
+              screenReaderAnnouncement:
+                "I'm a low attention notification screen reader announcement",
+            }
           )
         }
       >
@@ -65,7 +69,12 @@ const Important = Template<NotificationSystemProps>((args: NotificationSystemPro
               closeButtonText="Close"
               toastCloseButtonLabel="Close notification"
             />,
-            { attention: ATTENTION.MEDIUM, notificationSystemId: 'id' }
+            {
+              attention: ATTENTION.MEDIUM,
+              notificationSystemId: 'id',
+              screenReaderAnnouncement:
+                "I'm a medium attention notification screen reader announcement",
+            }
           )
         }
       >
@@ -94,7 +103,11 @@ const Mixed = Template<NotificationSystemProps>((args: NotificationSystemProps)
               toastCloseButtonLabel="Close notification"
               aria-label="Some notification"
             />,
-            { notificationSystemId: 'id' }
+            {
+              notificationSystemId: 'id',
+              screenReaderAnnouncement:
+                "I'm a low attention notification screen reader announcement",
+            }
           )
         }
       >
@@ -112,6 +125,8 @@ const Mixed = Template<NotificationSystemProps>((args: NotificationSystemProps)
             {
               attention: ATTENTION.MEDIUM,
               notificationSystemId: 'id',
+              screenReaderAnnouncement:
+                "I'm a medium attention notification screen reader announcement",
             }
           )
         }
diff --git a/src/components/NotificationSystem/NotificationSystem.tsx b/src/components/NotificationSystem/NotificationSystem.tsx
index ba4dfa1b2..ae94e58df 100644
--- a/src/components/NotificationSystem/NotificationSystem.tsx
+++ b/src/components/NotificationSystem/NotificationSystem.tsx
@@ -48,6 +48,7 @@ const NotificationSystem: FC<Props> & CompoundProps = (props: Props) => {
     toastClassName,
     bodyClassName,
     className: containerClassName,
+    // role: 'generic', // role="alert" (which is the default role for react-toastify's ToastContainer ) is not needed as the SR announcement of each notification is handled by the ScreenReaderAnnouncer component below.
   };
 
   // get an attention order array to position the toastContainers correctly based on the `position` prop
diff --git a/src/components/NotificationSystem/NotificationSystem.unit.test.tsx b/src/components/NotificationSystem/NotificationSystem.unit.test.tsx
index 5ee5f3a7f..de793b15d 100644
--- a/src/components/NotificationSystem/NotificationSystem.unit.test.tsx
+++ b/src/components/NotificationSystem/NotificationSystem.unit.test.tsx
@@ -364,9 +364,9 @@ describe('<NotificationSystem />', () => {
     });
   });
 
-  describe('actions', () => {
-    it('should show a notification after notify has been fired and disappears after dismiss has been fired', async () => {
-      expect.assertions(4);
+  describe.only('actions', () => {
+    it.only('should show a notification after notify has been fired and disappears after dismiss has been fired', async () => {
+      // expect.assertions(4);
 
       render(<NotificationSystem id="id" ariaLabel="test" />);
 
@@ -387,7 +387,7 @@ describe('<NotificationSystem />', () => {
       });
 
       // wait till the toast shows up on the screen:
-      const toast = await screen.findByRole('alert');
+      const toast = await screen.findByRole('generic');
       expect(toast).toBeVisible();
       expect(toast).toHaveTextContent(textContent);
 
@@ -398,9 +398,15 @@ describe('<NotificationSystem />', () => {
         NotificationSystem.dismiss(toastId);
       });
 
+      await waitFor(() => {
+        expect(NotificationSystem.isActive(toastId)).toBeFalsy();
+      });
+
+      screen.debug();
+
+      waitForElementToBeRemoved(() => screen.queryByRole('generic'));
+
       // check if toast got removed and the toast is not active anymore
-      await waitForElementToBeRemoved(() => screen.queryByRole('alert'));
-      expect(NotificationSystem.isActive(toastId)).toBeFalsy();
     });
 
     it('should close the `medium attention` notification after clicking on the close button', async () => {
@@ -446,7 +452,7 @@ describe('<NotificationSystem />', () => {
       expect(NotificationSystem.isActive(toastId)).toBeFalsy();
     });
 
-    it('should update an existing notification', async () => {
+    it.only('should update an existing notification', async () => {
       render(<NotificationSystem id="id" ariaLabel="test" />);
 
       const toastId = '12345';
@@ -467,7 +473,7 @@ describe('<NotificationSystem />', () => {
       });
 
       // wait till the toast shows up on the screen:
-      const toast = await screen.findByRole('alert');
+      const toast = await screen.findByRole('status');
       expect(toast).toBeVisible();
       expect(toast).toHaveTextContent(textContent);
 
@@ -487,11 +493,11 @@ describe('<NotificationSystem />', () => {
       });
 
       await waitFor(() => {
-        expect(screen.getByRole('alert')).toHaveTextContent(newcontent);
+        expect(screen.getByRole('status')).toHaveTextContent(newcontent);
       });
     });
 
-    it('should allow triggering notifications in multiple systems', async () => {
+    it.only('should allow triggering notifications in multiple systems', async () => {
       expect.assertions(7);
 
       const firstSystemId = 'id123';
@@ -518,7 +524,7 @@ describe('<NotificationSystem />', () => {
       });
 
       // wait till the first toast shows up on the screen:
-      const toasts = await screen.findAllByRole('alert');
+      const toasts = await screen.findAllByRole('status');
       expect(toasts).toHaveLength(1);
       expect(toasts[0]).toBeVisible();
       expect(toasts[0]).toHaveTextContent(textContent + firstSystemId);
@@ -541,7 +547,7 @@ describe('<NotificationSystem />', () => {
       // wait till the 2 toasts shows up on the screen:
       let toastsAfterUpdate: HTMLElement[];
       await waitFor(() => {
-        toastsAfterUpdate = screen.getAllByRole('alert');
+        toastsAfterUpdate = screen.getAllByRole('status');
         expect(toastsAfterUpdate).toHaveLength(2);
       });
       expect(toastsAfterUpdate[1]).toBeVisible();
diff --git a/src/components/NotificationSystem/NotificationSystem.unit.test.tsx.snap b/src/components/NotificationSystem/NotificationSystem.unit.test.tsx.snap
index f40b6799e..d981efc48 100644
--- a/src/components/NotificationSystem/NotificationSystem.unit.test.tsx.snap
+++ b/src/components/NotificationSystem/NotificationSystem.unit.test.tsx.snap
@@ -26,18 +26,23 @@ exports[`<NotificationSystem /> snapshot should match snapshot 1`] = `
         >
           <div
             class="Toastify__toast-body"
-            role="alert"
+            role="generic"
           >
             <div>
+              <span
+                data-focus-scope-start="true"
+                hidden=""
+              />
               <div
                 aria-label="Some notification"
+                aria-live="off"
                 class="md-toast-notification-wrapper md-modal-container-wrapper"
                 data-color="primary"
                 data-elevation="0"
                 data-exclude-focus="true"
                 data-padded="true"
                 data-round="50"
-                role="generic"
+                role="status"
                 tabindex="-1"
                 toastprops="[object Object]"
               >
@@ -109,6 +114,10 @@ exports[`<NotificationSystem /> snapshot should match snapshot 1`] = `
                   </div>
                 </div>
               </div>
+              <span
+                data-focus-scope-end="true"
+                hidden=""
+              />
             </div>
           </div>
           <div
@@ -156,18 +165,23 @@ exports[`<NotificationSystem /> snapshot should match snapshot if notification c
         >
           <div
             class="Toastify__toast-body"
-            role="alert"
+            role="generic"
           >
             <div>
+              <span
+                data-focus-scope-start="true"
+                hidden=""
+              />
               <div
                 aria-label="Some notification"
+                aria-live="off"
                 class="md-toast-notification-wrapper md-modal-container-wrapper"
                 data-color="primary"
                 data-elevation="0"
                 data-exclude-focus="true"
                 data-padded="true"
                 data-round="50"
-                role="generic"
+                role="status"
                 tabindex="-1"
                 toastprops="[object Object]"
               >
@@ -239,6 +253,10 @@ exports[`<NotificationSystem /> snapshot should match snapshot if notification c
                   </div>
                 </div>
               </div>
+              <span
+                data-focus-scope-end="true"
+                hidden=""
+              />
             </div>
           </div>
           <div
@@ -286,18 +304,23 @@ exports[`<NotificationSystem /> snapshot should match snapshot if notification c
         >
           <div
             class="Toastify__toast-body"
-            role="alert"
+            role="generic"
           >
             <div>
+              <span
+                data-focus-scope-start="true"
+                hidden=""
+              />
               <div
                 aria-label="Some notification"
+                aria-live="off"
                 class="md-toast-notification-wrapper md-modal-container-wrapper"
                 data-color="primary"
                 data-elevation="0"
                 data-exclude-focus="true"
                 data-padded="true"
                 data-round="50"
-                role="generic"
+                role="status"
                 tabindex="-1"
                 toastprops="[object Object]"
               >
@@ -369,6 +392,10 @@ exports[`<NotificationSystem /> snapshot should match snapshot if notification c
                   </div>
                 </div>
               </div>
+              <span
+                data-focus-scope-end="true"
+                hidden=""
+              />
             </div>
           </div>
           <div
@@ -416,18 +443,23 @@ exports[`<NotificationSystem /> snapshot should match snapshot when limit is set
         >
           <div
             class="Toastify__toast-body"
-            role="alert"
+            role="generic"
           >
             <div>
+              <span
+                data-focus-scope-start="true"
+                hidden=""
+              />
               <div
                 aria-label="Some notification"
+                aria-live="off"
                 class="md-toast-notification-wrapper md-modal-container-wrapper"
                 data-color="primary"
                 data-elevation="0"
                 data-exclude-focus="true"
                 data-padded="true"
                 data-round="50"
-                role="generic"
+                role="status"
                 tabindex="-1"
                 toastprops="[object Object]"
               >
@@ -499,6 +531,10 @@ exports[`<NotificationSystem /> snapshot should match snapshot when limit is set
                   </div>
                 </div>
               </div>
+              <span
+                data-focus-scope-end="true"
+                hidden=""
+              />
             </div>
           </div>
           <div
@@ -546,18 +582,23 @@ exports[`<NotificationSystem /> snapshot should match snapshot with ariaLabel pr
         >
           <div
             class="Toastify__toast-body"
-            role="alert"
+            role="generic"
           >
             <div>
+              <span
+                data-focus-scope-start="true"
+                hidden=""
+              />
               <div
                 aria-label="Some notification"
+                aria-live="off"
                 class="md-toast-notification-wrapper md-modal-container-wrapper"
                 data-color="primary"
                 data-elevation="0"
                 data-exclude-focus="true"
                 data-padded="true"
                 data-round="50"
-                role="generic"
+                role="status"
                 tabindex="-1"
                 toastprops="[object Object]"
               >
@@ -629,6 +670,10 @@ exports[`<NotificationSystem /> snapshot should match snapshot with ariaLabel pr
                   </div>
                 </div>
               </div>
+              <span
+                data-focus-scope-end="true"
+                hidden=""
+              />
             </div>
           </div>
           <div
@@ -676,18 +721,23 @@ exports[`<NotificationSystem /> snapshot should match snapshot with body class n
         >
           <div
             class="Toastify__toast-body body-toast"
-            role="alert"
+            role="generic"
           >
             <div>
+              <span
+                data-focus-scope-start="true"
+                hidden=""
+              />
               <div
                 aria-label="Some notification"
+                aria-live="off"
                 class="md-toast-notification-wrapper md-modal-container-wrapper"
                 data-color="primary"
                 data-elevation="0"
                 data-exclude-focus="true"
                 data-padded="true"
                 data-round="50"
-                role="generic"
+                role="status"
                 tabindex="-1"
                 toastprops="[object Object]"
               >
@@ -759,6 +809,10 @@ exports[`<NotificationSystem /> snapshot should match snapshot with body class n
                   </div>
                 </div>
               </div>
+              <span
+                data-focus-scope-end="true"
+                hidden=""
+              />
             </div>
           </div>
           <div
@@ -806,18 +860,23 @@ exports[`<NotificationSystem /> snapshot should match snapshot with className 1`
         >
           <div
             class="Toastify__toast-body"
-            role="alert"
+            role="generic"
           >
             <div>
+              <span
+                data-focus-scope-start="true"
+                hidden=""
+              />
               <div
                 aria-label="Some notification"
+                aria-live="off"
                 class="md-toast-notification-wrapper md-modal-container-wrapper"
                 data-color="primary"
                 data-elevation="0"
                 data-exclude-focus="true"
                 data-padded="true"
                 data-round="50"
-                role="generic"
+                role="status"
                 tabindex="-1"
                 toastprops="[object Object]"
               >
@@ -889,6 +948,10 @@ exports[`<NotificationSystem /> snapshot should match snapshot with className 1`
                   </div>
                 </div>
               </div>
+              <span
+                data-focus-scope-end="true"
+                hidden=""
+              />
             </div>
           </div>
           <div
@@ -936,18 +999,23 @@ exports[`<NotificationSystem /> snapshot should match snapshot with container cl
         >
           <div
             class="Toastify__toast-body container"
-            role="alert"
+            role="generic"
           >
             <div>
+              <span
+                data-focus-scope-start="true"
+                hidden=""
+              />
               <div
                 aria-label="Some notification"
+                aria-live="off"
                 class="md-toast-notification-wrapper md-modal-container-wrapper"
                 data-color="primary"
                 data-elevation="0"
                 data-exclude-focus="true"
                 data-padded="true"
                 data-round="50"
-                role="generic"
+                role="status"
                 tabindex="-1"
                 toastprops="[object Object]"
               >
@@ -1019,6 +1087,10 @@ exports[`<NotificationSystem /> snapshot should match snapshot with container cl
                   </div>
                 </div>
               </div>
+              <span
+                data-focus-scope-end="true"
+                hidden=""
+              />
             </div>
           </div>
           <div
@@ -1062,18 +1134,23 @@ exports[`<NotificationSystem /> snapshot should match snapshot with different at
         >
           <div
             class="Toastify__toast-body"
-            role="alert"
+            role="generic"
           >
             <div>
+              <span
+                data-focus-scope-start="true"
+                hidden=""
+              />
               <div
                 aria-label="Some notification"
+                aria-live="off"
                 class="md-toast-notification-wrapper md-modal-container-wrapper"
                 data-color="primary"
                 data-elevation="0"
                 data-exclude-focus="true"
                 data-padded="true"
                 data-round="50"
-                role="generic"
+                role="status"
                 tabindex="-1"
                 toastprops="[object Object]"
               >
@@ -1145,6 +1222,10 @@ exports[`<NotificationSystem /> snapshot should match snapshot with different at
                   </div>
                 </div>
               </div>
+              <span
+                data-focus-scope-end="true"
+                hidden=""
+              />
             </div>
           </div>
         </div>
@@ -1185,18 +1266,23 @@ exports[`<NotificationSystem /> snapshot should match snapshot with different po
         >
           <div
             class="Toastify__toast-body"
-            role="alert"
+            role="generic"
           >
             <div>
+              <span
+                data-focus-scope-start="true"
+                hidden=""
+              />
               <div
                 aria-label="Some notification"
+                aria-live="off"
                 class="md-toast-notification-wrapper md-modal-container-wrapper"
                 data-color="primary"
                 data-elevation="0"
                 data-exclude-focus="true"
                 data-padded="true"
                 data-round="50"
-                role="generic"
+                role="status"
                 tabindex="-1"
                 toastprops="[object Object]"
               >
@@ -1268,6 +1354,10 @@ exports[`<NotificationSystem /> snapshot should match snapshot with different po
                   </div>
                 </div>
               </div>
+              <span
+                data-focus-scope-end="true"
+                hidden=""
+              />
             </div>
           </div>
           <div
@@ -1319,18 +1409,23 @@ exports[`<NotificationSystem /> snapshot should match snapshot with different zI
         >
           <div
             class="Toastify__toast-body"
-            role="alert"
+            role="generic"
           >
             <div>
+              <span
+                data-focus-scope-start="true"
+                hidden=""
+              />
               <div
                 aria-label="Some notification"
+                aria-live="off"
                 class="md-toast-notification-wrapper md-modal-container-wrapper"
                 data-color="primary"
                 data-elevation="0"
                 data-exclude-focus="true"
                 data-padded="true"
                 data-round="50"
-                role="generic"
+                role="status"
                 tabindex="-1"
                 toastprops="[object Object]"
               >
@@ -1402,6 +1497,10 @@ exports[`<NotificationSystem /> snapshot should match snapshot with different zI
                   </div>
                 </div>
               </div>
+              <span
+                data-focus-scope-end="true"
+                hidden=""
+              />
             </div>
           </div>
           <div
@@ -1449,18 +1548,23 @@ exports[`<NotificationSystem /> snapshot should match snapshot with enter animat
         >
           <div
             class="Toastify__toast-body"
-            role="alert"
+            role="generic"
           >
             <div>
+              <span
+                data-focus-scope-start="true"
+                hidden=""
+              />
               <div
                 aria-label="Some notification"
+                aria-live="off"
                 class="md-toast-notification-wrapper md-modal-container-wrapper"
                 data-color="primary"
                 data-elevation="0"
                 data-exclude-focus="true"
                 data-padded="true"
                 data-round="50"
-                role="generic"
+                role="status"
                 tabindex="-1"
                 toastprops="[object Object]"
               >
@@ -1532,6 +1636,10 @@ exports[`<NotificationSystem /> snapshot should match snapshot with enter animat
                   </div>
                 </div>
               </div>
+              <span
+                data-focus-scope-end="true"
+                hidden=""
+              />
             </div>
           </div>
           <div
@@ -1579,18 +1687,23 @@ exports[`<NotificationSystem /> snapshot should match snapshot with id 1`] = `
         >
           <div
             class="Toastify__toast-body"
-            role="alert"
+            role="generic"
           >
             <div>
+              <span
+                data-focus-scope-start="true"
+                hidden=""
+              />
               <div
                 aria-label="Some notification"
+                aria-live="off"
                 class="md-toast-notification-wrapper md-modal-container-wrapper"
                 data-color="primary"
                 data-elevation="0"
                 data-exclude-focus="true"
                 data-padded="true"
                 data-round="50"
-                role="generic"
+                role="status"
                 tabindex="-1"
                 toastprops="[object Object]"
               >
@@ -1662,6 +1775,10 @@ exports[`<NotificationSystem /> snapshot should match snapshot with id 1`] = `
                   </div>
                 </div>
               </div>
+              <span
+                data-focus-scope-end="true"
+                hidden=""
+              />
             </div>
           </div>
           <div
@@ -1709,18 +1826,23 @@ exports[`<NotificationSystem /> snapshot should match snapshot with newest on to
         >
           <div
             class="Toastify__toast-body"
-            role="alert"
+            role="generic"
           >
             <div>
+              <span
+                data-focus-scope-start="true"
+                hidden=""
+              />
               <div
                 aria-label="Some notification"
+                aria-live="off"
                 class="md-toast-notification-wrapper md-modal-container-wrapper"
                 data-color="primary"
                 data-elevation="0"
                 data-exclude-focus="true"
                 data-padded="true"
                 data-round="50"
-                role="generic"
+                role="status"
                 tabindex="-1"
                 toastprops="[object Object]"
               >
@@ -1792,6 +1914,10 @@ exports[`<NotificationSystem /> snapshot should match snapshot with newest on to
                   </div>
                 </div>
               </div>
+              <span
+                data-focus-scope-end="true"
+                hidden=""
+              />
             </div>
           </div>
           <div
@@ -1839,18 +1965,23 @@ exports[`<NotificationSystem /> snapshot should match snapshot with style 1`] =
         >
           <div
             class="Toastify__toast-body"
-            role="alert"
+            role="generic"
           >
             <div>
+              <span
+                data-focus-scope-start="true"
+                hidden=""
+              />
               <div
                 aria-label="Some notification"
+                aria-live="off"
                 class="md-toast-notification-wrapper md-modal-container-wrapper"
                 data-color="primary"
                 data-elevation="0"
                 data-exclude-focus="true"
                 data-padded="true"
                 data-round="50"
-                role="generic"
+                role="status"
                 tabindex="-1"
                 toastprops="[object Object]"
               >
@@ -1922,6 +2053,10 @@ exports[`<NotificationSystem /> snapshot should match snapshot with style 1`] =
                   </div>
                 </div>
               </div>
+              <span
+                data-focus-scope-end="true"
+                hidden=""
+              />
             </div>
           </div>
           <div
@@ -1969,18 +2104,23 @@ exports[`<NotificationSystem /> snapshot should match snapshot with toast class
         >
           <div
             class="Toastify__toast-body"
-            role="alert"
+            role="generic"
           >
             <div>
+              <span
+                data-focus-scope-start="true"
+                hidden=""
+              />
               <div
                 aria-label="Some notification"
+                aria-live="off"
                 class="md-toast-notification-wrapper md-modal-container-wrapper"
                 data-color="primary"
                 data-elevation="0"
                 data-exclude-focus="true"
                 data-padded="true"
                 data-round="50"
-                role="generic"
+                role="status"
                 tabindex="-1"
                 toastprops="[object Object]"
               >
@@ -2052,6 +2192,10 @@ exports[`<NotificationSystem /> snapshot should match snapshot with toast class
                   </div>
                 </div>
               </div>
+              <span
+                data-focus-scope-end="true"
+                hidden=""
+              />
             </div>
           </div>
           <div
diff --git a/src/components/NotificationSystem/NotificationSystem.utils.ts b/src/components/NotificationSystem/NotificationSystem.utils.ts
index 839400a75..50ad81293 100644
--- a/src/components/NotificationSystem/NotificationSystem.utils.ts
+++ b/src/components/NotificationSystem/NotificationSystem.utils.ts
@@ -75,6 +75,7 @@ export const update = (toastId: Id, options: UpdateOptionsType): void => {
  * @param toastId id of the notification to dismiss
  */
 export const dismiss = (toastId: Id): void => {
+  console.log('CLOSING!!');
   toast.dismiss(toastId);
 };
 
diff --git a/src/components/ToastNotification/ToastNotification.constants.ts b/src/components/ToastNotification/ToastNotification.constants.ts
index b305dba65..2236a75ee 100644
--- a/src/components/ToastNotification/ToastNotification.constants.ts
+++ b/src/components/ToastNotification/ToastNotification.constants.ts
@@ -1,5 +1,9 @@
 const CLASS_PREFIX = 'md-toast-notification';
 
+const DEFAULTS = {
+  INTERRUPTS_USER_FLOW: false,
+};
+
 const STYLE = {
   wrapper: `${CLASS_PREFIX}-wrapper`,
   body: `${CLASS_PREFIX}-body`,
@@ -9,4 +13,4 @@ const STYLE = {
   buttonGroup: `${CLASS_PREFIX}-button-group`,
 };
 
-export { CLASS_PREFIX, STYLE };
+export { CLASS_PREFIX, STYLE, DEFAULTS };
diff --git a/src/components/ToastNotification/ToastNotification.stories.args.ts b/src/components/ToastNotification/ToastNotification.stories.args.ts
index 16288259d..1917e1adb 100644
--- a/src/components/ToastNotification/ToastNotification.stories.args.ts
+++ b/src/components/ToastNotification/ToastNotification.stories.args.ts
@@ -1,4 +1,5 @@
 import { commonStyles } from '../../storybook/helper.stories.argtypes';
+import { DEFAULTS } from '../ToastNotification/ToastNotification.constants';
 
 const toastNotificationArgTypes = {
   content: {
@@ -25,6 +26,18 @@ const toastNotificationArgTypes = {
       },
     },
   },
+  interruptsUserFlow: {
+    description: 'Whether the notification interrupts user flow.  ',
+    control: { type: 'boolean' },
+    table: {
+      type: {
+        summary: 'boolean',
+      },
+      defaultValue: {
+        summary: DEFAULTS.INTERRUPTS_USER_FLOW,
+      },
+    },
+  },
 };
 
 export { toastNotificationArgTypes };
diff --git a/src/components/ToastNotification/ToastNotification.stories.tsx b/src/components/ToastNotification/ToastNotification.stories.tsx
index a74c6d2ae..285050f5a 100644
--- a/src/components/ToastNotification/ToastNotification.stories.tsx
+++ b/src/components/ToastNotification/ToastNotification.stories.tsx
@@ -46,6 +46,17 @@ Example.args = {
   closeButtonLabel: 'Close notification',
 };
 
+const NonInteractive = Template<ToastNotificationProps>(ToastNotification).bind({});
+
+NonInteractive.argTypes = {
+  ...argTypes,
+  content: 'Some announcement with no buttons',
+};
+
+NonInteractive.args = {
+  content: 'Some announcement with no buttons',
+};
+
 const LeadingVisual = MultiTemplate<ToastNotificationProps>(ToastNotification).bind({});
 
 LeadingVisual.argTypes = { ...argTypes, onClose: { action: 'closed' } };
@@ -198,4 +209,4 @@ Common.parameters = {
   ],
 };
 
-export { Example, LeadingVisual, ButtonGroup, Common };
+export { Example, NonInteractive, LeadingVisual, ButtonGroup, Common };
diff --git a/src/components/ToastNotification/ToastNotification.tsx b/src/components/ToastNotification/ToastNotification.tsx
index 1a419d114..e8d8aa622 100644
--- a/src/components/ToastNotification/ToastNotification.tsx
+++ b/src/components/ToastNotification/ToastNotification.tsx
@@ -5,7 +5,7 @@ import ModalContainer from '../ModalContainer';
 import ButtonCircle from '../ButtonCircle';
 import Icon from '../Icon';
 
-import { STYLE } from './ToastNotification.constants';
+import { STYLE, DEFAULTS } from './ToastNotification.constants';
 import { Props } from './ToastNotification.types';
 import './ToastNotification.style.scss';
 import Text from '../Text';
@@ -23,9 +23,25 @@ const ToastNotification: FC<Props> = (props: Props) => {
     buttonGroup,
     onClose,
     closeButtonLabel,
+    interruptsUserFlow = DEFAULTS.INTERRUPTS_USER_FLOW,
     ...rest
   } = props;
 
+  const isInteractiveDialog = !!onClose || !!buttonGroup;
+
+  if (interruptsUserFlow && !isInteractiveDialog) {
+    console.warn(
+      'MRV2 ToastNotification: If a ToastNotification interrupts user flow, please make sure it has at least one interactive element inside for the user to act and continue the flow.'
+    );
+  }
+
+  // If an alert toast interrupts a user's workflow to communicate an important message and require a response, then it should have role="alertdialog", it will be treated as a modal dialog.
+  // Otherwise, if the toast has interactive controls, it should have role="status".
+  // Otherwise, it should have role="alert" and aria-hidden="true".
+  const role = props.role || (interruptsUserFlow ? 'alertdialog' : 'status');
+  const ariaHiddenProps =
+    !interruptsUserFlow && !isInteractiveDialog ? { 'aria-hidden': true } : {};
+
   return (
     <ModalContainer
       className={classnames(className, STYLE.wrapper)}
@@ -33,8 +49,10 @@ const ToastNotification: FC<Props> = (props: Props) => {
       id={id}
       style={style}
       round={50}
-      role="generic"
-      ariaModal={false}
+      role={role}
+      focusLockProps={{ autoFocus: interruptsUserFlow }} // modal dialogs should lock focus on themselves until user has taken action about them
+      aria-live="off" // no need for aria-live as SR announcement is controlled by the NotificationSystem.announce({screenReaderAnnouncement?: string}) method
+      {...ariaHiddenProps}
       {...rest}
     >
       <div className={STYLE.body}>
@@ -42,7 +60,11 @@ const ToastNotification: FC<Props> = (props: Props) => {
           <div className={classnames(className, STYLE.leadingVisual)}>{leadingVisual}</div>
         )}
         {isString(content) ? (
-          <Text className={classnames(className, STYLE.content)} type="body-primary" tagName="p">
+          <Text
+            className={classnames(className, STYLE.content)}
+            type="body-primary"
+            tagName={interruptsUserFlow ? 'h2' : 'p'} // any modal dialog (which locks the focus) must have a heading level 2 on its visible title
+          >
             {content}
           </Text>
         ) : (
diff --git a/src/components/ToastNotification/ToastNotification.types.ts b/src/components/ToastNotification/ToastNotification.types.ts
index 70bc92836..ef6f9e37b 100644
--- a/src/components/ToastNotification/ToastNotification.types.ts
+++ b/src/components/ToastNotification/ToastNotification.types.ts
@@ -34,33 +34,44 @@ export type ToastNotificationCloseButtonProps =
       closeButtonLabel: string;
     };
 
-export type Props = ToastNotificationCloseButtonProps & AriaLabelRequired & {
-  /**
-   * The free string or a ReactElement that appears inside the Notification toast.
-   */
-  content: ReactNode;
-  /**
-   * Leading visual of this notification toast. It can be an Icon, Avatar or Badge.
-   */
-  leadingVisual?: ReactElement<SupportedLeadingVisuals>;
+export type Props = ToastNotificationCloseButtonProps &
+  AriaLabelRequired & {
+    /**
+     * The free string or a ReactElement that appears inside the Notification toast.
+     */
+    content: ReactNode;
+    /**
+     * Leading visual of this notification toast. It can be an Icon, Avatar or Badge.
+     */
+    leadingVisual?: ReactElement<SupportedLeadingVisuals>;
 
-  /**
-   * Button group that appears on the bottom of this Notification toast.
-   */
-  buttonGroup?: ReactElement<SupportedButtonGroup>;
+    /**
+     * Button group that appears on the bottom of this Notification toast.
+     */
+    buttonGroup?: ReactElement<SupportedButtonGroup>;
 
-  /**
-   * Custom class for overriding this component's CSS.
-   */
-  className?: string;
+    /**
+     * Custom class for overriding this component's CSS.
+     */
+    className?: string;
 
-  /**
-   * Custom id for overriding this component's CSS.
-   */
-  id?: string;
+    /**
+     * Custom id for overriding this component's CSS.
+     */
+    id?: string;
 
-  /**
-   * Custom style for overriding this component's CSS.
-   */
-  style?: CSSProperties;
-};
+    /**
+     * Custom style for overriding this component's CSS.
+     */
+    style?: CSSProperties;
+
+    /**
+     * Custom role for overriding this component's role. Use 'alertdialog' for interactive dialogs if onClose and buttonGroup are provided are undefined.
+     */
+    role?: string;
+
+    /**
+     * Whether this notification toast interrupts user flow. Default is false.
+     */
+    interruptsUserFlow?: boolean;
+  };
diff --git a/src/components/ToastNotification/ToastNotification.unit.test.tsx b/src/components/ToastNotification/ToastNotification.unit.test.tsx
index 216131632..0a99fefe1 100644
--- a/src/components/ToastNotification/ToastNotification.unit.test.tsx
+++ b/src/components/ToastNotification/ToastNotification.unit.test.tsx
@@ -87,6 +87,18 @@ describe('<ToastNotification />', () => {
       expect(container).toMatchSnapshot();
     });
 
+    it('should match snapshot with role', async () => {
+      expect.assertions(1);
+
+      const role = 'example-id';
+
+      const container = await mountAndWait(
+        <ToastNotification aria-label="Some label" role={role} content={exampleContent} />
+      );
+
+      expect(container).toMatchSnapshot();
+    });
+
     it('should match snapshot with style', async () => {
       expect.assertions(1);
 
@@ -163,6 +175,20 @@ describe('<ToastNotification />', () => {
 
       expect(container).toMatchSnapshot();
     });
+
+    it('should match snapshot with interruptsUserFlow', async () => {
+      expect.assertions(1);
+
+      const container = await mountAndWait(
+        <ToastNotification
+          aria-label="Some label"
+          content={exampleContent}
+          interruptsUserFlow={true}
+        />
+      );
+
+      expect(container).toMatchSnapshot();
+    });
   });
 
   describe('attributes', () => {
@@ -174,7 +200,7 @@ describe('<ToastNotification />', () => {
       );
       const element = wrapper.find(ToastNotification).getDOMNode();
 
-      expect(element.classList.contains(CONSTANTS.STYLE.wrapper)).toBe(true);
+      expect(element[1].classList.contains(CONSTANTS.STYLE.wrapper)).toBe(true);
     });
 
     it('should have provided class when className is provided', async () => {
@@ -187,7 +213,7 @@ describe('<ToastNotification />', () => {
       );
       const element = wrapper.find(ToastNotification).getDOMNode();
 
-      expect(element.classList.contains(className)).toBe(true);
+      expect(element[1].classList.contains(className)).toBe(true);
     });
 
     it('should have provided aria-label when aria-label is provided', async () => {
@@ -200,7 +226,7 @@ describe('<ToastNotification />', () => {
       );
       const element = wrapper.find(ToastNotification).getDOMNode();
 
-      expect(element.getAttribute('aria-label')).toBe(ariaLabel);
+      expect(element[1].getAttribute('aria-label')).toBe(ariaLabel);
     });
 
     it('should have provided aria-labelledby when aria-labelledby is provided', async () => {
@@ -213,7 +239,7 @@ describe('<ToastNotification />', () => {
       );
       const element = wrapper.find(ToastNotification).getDOMNode();
 
-      expect(element.getAttribute('aria-labelledby')).toBe(ariaLabelledby);
+      expect(element[1].getAttribute('aria-labelledby')).toBe(ariaLabelledby);
     });
 
     it('should have provided id when id is provided', async () => {
@@ -226,7 +252,20 @@ describe('<ToastNotification />', () => {
       );
       const element = wrapper.find(ToastNotification).getDOMNode();
 
-      expect(element.id).toBe(id);
+      expect(element[1].id).toBe(id);
+    });
+
+    it('should have provided role when role is provided', async () => {
+      expect.assertions(1);
+
+      const role = 'some-fake-role';
+
+      const wrapper = await mountAndWait(
+        <ToastNotification aria-label="Some label" role={role} content={exampleContent} />
+      );
+      const element = wrapper.find(ToastNotification).getDOMNode();
+
+      expect(element[1].getAttribute('role')).toBe(role);
     });
 
     it('should have provided style when style is provided', async () => {
@@ -240,7 +279,7 @@ describe('<ToastNotification />', () => {
       );
       const element = wrapper.find(ToastNotification).getDOMNode();
 
-      expect(element.getAttribute('style')).toBe(styleString);
+      expect(element[1].getAttribute('style')).toBe(styleString);
     });
 
     it('should wrap the onClose inside when onClose is provided and closeButtonLabel is undefined', async () => {
@@ -274,6 +313,50 @@ describe('<ToastNotification />', () => {
       expect(button.props()['aria-label']).toBe('close');
     });
 
+    it('should assign role="alertdialog" when it interruptsUserFlow', async () => {
+      expect.assertions(1);
+
+      const wrapper = await mountAndWait(
+        <ToastNotification
+          aria-label="Some label"
+          onClose={onClose}
+          closeButtonLabel={'close'}
+          content={exampleContent}
+          interruptsUserFlow={true}
+        />
+      );
+      const element = wrapper.find(ToastNotification).getDOMNode();
+
+      expect(element[1].getAttribute('role')).toBe('alertdialog');
+    });
+
+    it('should assign role="status" when it does not interruptUserFlow and buttons are provided', async () => {
+      expect.assertions(1);
+
+      const wrapper = await mountAndWait(
+        <ToastNotification
+          aria-label="Some label"
+          buttonGroup={buttonGroup}
+          content={exampleContent}
+        />
+      );
+      const element = wrapper.find(ToastNotification).getDOMNode();
+
+      expect(element[1].getAttribute('role')).toBe('status');
+    });
+
+    it('should assign role="alert" and aria-hidden="true" when it does not interruptUserFlow and no no buttons are provided', async () => {
+      expect.assertions(2);
+
+      const wrapper = await mountAndWait(
+        <ToastNotification aria-label="Some label" content={exampleContent} />
+      );
+      const element = wrapper.find(ToastNotification).getDOMNode();
+
+      expect(element[1].getAttribute('role')).toBe('alert');
+      expect(element[1].getAttribute('aria-hidden')).toBe('true');
+    });
+
     it('should wrap Icon inside leadingVisual when Icon is provided', async () => {
       expect.assertions(1);
 
@@ -340,7 +423,7 @@ describe('<ToastNotification />', () => {
 
       const wrapper = await mountAndWait(
         <ToastNotification
-          aria-label='Some label'
+          aria-label="Some label"
           onClose={mockCallback}
           content={exampleContent}
           closeButtonLabel="Close notification"
diff --git a/src/components/ToastNotification/ToastNotification.unit.test.tsx.snap b/src/components/ToastNotification/ToastNotification.unit.test.tsx.snap
index c63861a80..13524de37 100644
--- a/src/components/ToastNotification/ToastNotification.unit.test.tsx.snap
+++ b/src/components/ToastNotification/ToastNotification.unit.test.tsx.snap
@@ -6,47 +6,68 @@ exports[`<ToastNotification /> snapshot should match snapshot 1`] = `
   content="Example text"
 >
   <ModalContainer
+    aria-hidden={true}
     aria-label="Some label"
-    ariaModal={false}
+    aria-live="off"
     className="md-toast-notification-wrapper"
+    focusLockProps={
+      Object {
+        "autoFocus": false,
+      }
+    }
     isPadded={true}
-    role="generic"
+    role="alert"
     round={50}
   >
-    <div
-      aria-label="Some label"
-      className="md-toast-notification-wrapper md-modal-container-wrapper"
-      data-color="primary"
-      data-elevation={0}
-      data-exclude-focus={true}
-      data-padded={true}
-      data-round={50}
-      role="generic"
-      tabIndex={-1}
+    <FocusScope
+      autoFocus={false}
+      contain={true}
     >
+      <span
+        data-focus-scope-start={true}
+        hidden={true}
+      />
       <div
-        className="md-toast-notification-body"
+        aria-hidden={true}
+        aria-label="Some label"
+        aria-live="off"
+        className="md-toast-notification-wrapper md-modal-container-wrapper"
+        data-color="primary"
+        data-elevation={0}
+        data-exclude-focus={true}
+        data-padded={true}
+        data-round={50}
+        role="alert"
+        tabIndex={-1}
       >
-        <Text
-          className="md-toast-notification-content"
-          tagName="p"
-          type="body-primary"
+        <div
+          className="md-toast-notification-body"
         >
           <Text
-            className="md-text-wrapper md-toast-notification-content"
-            tagname="p"
-            type="body-large-regular"
+            className="md-toast-notification-content"
+            tagName="p"
+            type="body-primary"
           >
-            <mdc-text
-              class="md-text-wrapper md-toast-notification-content"
-              suppressHydrationWarning={true}
+            <Text
+              className="md-text-wrapper md-toast-notification-content"
+              tagname="p"
+              type="body-large-regular"
             >
-              Example text
-            </mdc-text>
+              <mdc-text
+                class="md-text-wrapper md-toast-notification-content"
+                suppressHydrationWarning={true}
+              >
+                Example text
+              </mdc-text>
+            </Text>
           </Text>
-        </Text>
+        </div>
       </div>
-    </div>
+      <span
+        data-focus-scope-end={true}
+        hidden={true}
+      />
+    </FocusScope>
   </ModalContainer>
 </ToastNotification>
 `;
@@ -57,47 +78,68 @@ exports[`<ToastNotification /> snapshot should match snapshot with aria-label 1`
   content="Example text"
 >
   <ModalContainer
+    aria-hidden={true}
     aria-label="test"
-    ariaModal={false}
+    aria-live="off"
     className="md-toast-notification-wrapper"
+    focusLockProps={
+      Object {
+        "autoFocus": false,
+      }
+    }
     isPadded={true}
-    role="generic"
+    role="alert"
     round={50}
   >
-    <div
-      aria-label="test"
-      className="md-toast-notification-wrapper md-modal-container-wrapper"
-      data-color="primary"
-      data-elevation={0}
-      data-exclude-focus={true}
-      data-padded={true}
-      data-round={50}
-      role="generic"
-      tabIndex={-1}
+    <FocusScope
+      autoFocus={false}
+      contain={true}
     >
+      <span
+        data-focus-scope-start={true}
+        hidden={true}
+      />
       <div
-        className="md-toast-notification-body"
+        aria-hidden={true}
+        aria-label="test"
+        aria-live="off"
+        className="md-toast-notification-wrapper md-modal-container-wrapper"
+        data-color="primary"
+        data-elevation={0}
+        data-exclude-focus={true}
+        data-padded={true}
+        data-round={50}
+        role="alert"
+        tabIndex={-1}
       >
-        <Text
-          className="md-toast-notification-content"
-          tagName="p"
-          type="body-primary"
+        <div
+          className="md-toast-notification-body"
         >
           <Text
-            className="md-text-wrapper md-toast-notification-content"
-            tagname="p"
-            type="body-large-regular"
+            className="md-toast-notification-content"
+            tagName="p"
+            type="body-primary"
           >
-            <mdc-text
-              class="md-text-wrapper md-toast-notification-content"
-              suppressHydrationWarning={true}
+            <Text
+              className="md-text-wrapper md-toast-notification-content"
+              tagname="p"
+              type="body-large-regular"
             >
-              Example text
-            </mdc-text>
+              <mdc-text
+                class="md-text-wrapper md-toast-notification-content"
+                suppressHydrationWarning={true}
+              >
+                Example text
+              </mdc-text>
+            </Text>
           </Text>
-        </Text>
+        </div>
       </div>
-    </div>
+      <span
+        data-focus-scope-end={true}
+        hidden={true}
+      />
+    </FocusScope>
   </ModalContainer>
 </ToastNotification>
 `;
@@ -108,47 +150,68 @@ exports[`<ToastNotification /> snapshot should match snapshot with aria-labelled
   content="Example text"
 >
   <ModalContainer
+    aria-hidden={true}
     aria-labelledby="test-id"
-    ariaModal={false}
+    aria-live="off"
     className="md-toast-notification-wrapper"
+    focusLockProps={
+      Object {
+        "autoFocus": false,
+      }
+    }
     isPadded={true}
-    role="generic"
+    role="alert"
     round={50}
   >
-    <div
-      aria-labelledby="test-id"
-      className="md-toast-notification-wrapper md-modal-container-wrapper"
-      data-color="primary"
-      data-elevation={0}
-      data-exclude-focus={true}
-      data-padded={true}
-      data-round={50}
-      role="generic"
-      tabIndex={-1}
+    <FocusScope
+      autoFocus={false}
+      contain={true}
     >
+      <span
+        data-focus-scope-start={true}
+        hidden={true}
+      />
       <div
-        className="md-toast-notification-body"
+        aria-hidden={true}
+        aria-labelledby="test-id"
+        aria-live="off"
+        className="md-toast-notification-wrapper md-modal-container-wrapper"
+        data-color="primary"
+        data-elevation={0}
+        data-exclude-focus={true}
+        data-padded={true}
+        data-round={50}
+        role="alert"
+        tabIndex={-1}
       >
-        <Text
-          className="md-toast-notification-content"
-          tagName="p"
-          type="body-primary"
+        <div
+          className="md-toast-notification-body"
         >
           <Text
-            className="md-text-wrapper md-toast-notification-content"
-            tagname="p"
-            type="body-large-regular"
+            className="md-toast-notification-content"
+            tagName="p"
+            type="body-primary"
           >
-            <mdc-text
-              class="md-text-wrapper md-toast-notification-content"
-              suppressHydrationWarning={true}
+            <Text
+              className="md-text-wrapper md-toast-notification-content"
+              tagname="p"
+              type="body-large-regular"
             >
-              Example text
-            </mdc-text>
+              <mdc-text
+                class="md-text-wrapper md-toast-notification-content"
+                suppressHydrationWarning={true}
+              >
+                Example text
+              </mdc-text>
+            </Text>
           </Text>
-        </Text>
+        </div>
       </div>
-    </div>
+      <span
+        data-focus-scope-end={true}
+        hidden={true}
+      />
+    </FocusScope>
   </ModalContainer>
 </ToastNotification>
 `;
@@ -175,163 +238,182 @@ exports[`<ToastNotification /> snapshot should match snapshot with button group
 >
   <ModalContainer
     aria-label="Some label"
-    ariaModal={false}
+    aria-live="off"
     className="md-toast-notification-wrapper"
+    focusLockProps={
+      Object {
+        "autoFocus": false,
+      }
+    }
     isPadded={true}
-    role="generic"
+    role="status"
     round={50}
   >
-    <div
-      aria-label="Some label"
-      className="md-toast-notification-wrapper md-modal-container-wrapper"
-      data-color="primary"
-      data-elevation={0}
-      data-exclude-focus={true}
-      data-padded={true}
-      data-round={50}
-      role="generic"
-      tabIndex={-1}
+    <FocusScope
+      autoFocus={false}
+      contain={true}
     >
+      <span
+        data-focus-scope-start={true}
+        hidden={true}
+      />
       <div
-        className="md-toast-notification-body"
+        aria-label="Some label"
+        aria-live="off"
+        className="md-toast-notification-wrapper md-modal-container-wrapper"
+        data-color="primary"
+        data-elevation={0}
+        data-exclude-focus={true}
+        data-padded={true}
+        data-round={50}
+        role="status"
+        tabIndex={-1}
       >
-        <Text
-          className="md-toast-notification-content"
-          tagName="p"
-          type="body-primary"
+        <div
+          className="md-toast-notification-body"
         >
           <Text
-            className="md-text-wrapper md-toast-notification-content"
-            tagname="p"
-            type="body-large-regular"
+            className="md-toast-notification-content"
+            tagName="p"
+            type="body-primary"
           >
-            <mdc-text
-              class="md-text-wrapper md-toast-notification-content"
-              suppressHydrationWarning={true}
+            <Text
+              className="md-text-wrapper md-toast-notification-content"
+              tagname="p"
+              type="body-large-regular"
             >
-              Example text
-            </mdc-text>
+              <mdc-text
+                class="md-text-wrapper md-toast-notification-content"
+                suppressHydrationWarning={true}
+              >
+                Example text
+              </mdc-text>
+            </Text>
           </Text>
-        </Text>
-      </div>
-      <div
-        className="md-toast-notification-button-group"
-      >
-        <ButtonPill
-          size={28}
+        </div>
+        <div
+          className="md-toast-notification-button-group"
         >
-          <ButtonSimple
-            aria-disabled={false}
-            className="md-button-pill-wrapper"
-            data-color="primary"
-            data-disabled={false}
-            data-disabled-outline={false}
-            data-ghost={false}
-            data-grown={false}
-            data-inverted={false}
-            data-outline={false}
-            data-shallow-disabled={false}
-            data-size={28}
+          <ButtonPill
+            size={28}
           >
-            <FocusRing>
-              <FocusRing
-                focusClass="md-focus-ring-wrapper children"
-                focusRingClass="md-focus-ring-wrapper children"
-              >
-                <button
-                  className="md-button-pill-wrapper md-button-simple-wrapper"
-                  data-color="primary"
-                  data-disabled={false}
-                  data-disabled-outline={false}
-                  data-ghost={false}
-                  data-grown={false}
-                  data-inverted={false}
-                  data-outline={false}
-                  data-shallow-disabled={false}
-                  data-size={28}
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onDragStart={[Function]}
-                  onFocus={[Function]}
-                  onKeyDown={[Function]}
-                  onKeyUp={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseEnter={[Function]}
-                  onMouseLeave={[Function]}
-                  onMouseUp={[Function]}
-                  onTouchCancel={[Function]}
-                  onTouchEnd={[Function]}
-                  onTouchMove={[Function]}
-                  onTouchStart={[Function]}
-                  type="button"
+            <ButtonSimple
+              aria-disabled={false}
+              className="md-button-pill-wrapper"
+              data-color="primary"
+              data-disabled={false}
+              data-disabled-outline={false}
+              data-ghost={false}
+              data-grown={false}
+              data-inverted={false}
+              data-outline={false}
+              data-shallow-disabled={false}
+              data-size={28}
+            >
+              <FocusRing>
+                <FocusRing
+                  focusClass="md-focus-ring-wrapper children"
+                  focusRingClass="md-focus-ring-wrapper children"
                 >
-                  <span>
-                    Button
-                  </span>
-                </button>
+                  <button
+                    className="md-button-pill-wrapper md-button-simple-wrapper"
+                    data-color="primary"
+                    data-disabled={false}
+                    data-disabled-outline={false}
+                    data-ghost={false}
+                    data-grown={false}
+                    data-inverted={false}
+                    data-outline={false}
+                    data-shallow-disabled={false}
+                    data-size={28}
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onDragStart={[Function]}
+                    onFocus={[Function]}
+                    onKeyDown={[Function]}
+                    onKeyUp={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseEnter={[Function]}
+                    onMouseLeave={[Function]}
+                    onMouseUp={[Function]}
+                    onTouchCancel={[Function]}
+                    onTouchEnd={[Function]}
+                    onTouchMove={[Function]}
+                    onTouchStart={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Button
+                    </span>
+                  </button>
+                </FocusRing>
               </FocusRing>
-            </FocusRing>
-          </ButtonSimple>
-        </ButtonPill>
-        <ButtonPill
-          outline={true}
-          size={28}
-        >
-          <ButtonSimple
-            aria-disabled={false}
-            className="md-button-pill-wrapper"
-            data-color="primary"
-            data-disabled={false}
-            data-disabled-outline={false}
-            data-ghost={false}
-            data-grown={false}
-            data-inverted={false}
-            data-outline={true}
-            data-shallow-disabled={false}
-            data-size={28}
+            </ButtonSimple>
+          </ButtonPill>
+          <ButtonPill
+            outline={true}
+            size={28}
           >
-            <FocusRing>
-              <FocusRing
-                focusClass="md-focus-ring-wrapper children"
-                focusRingClass="md-focus-ring-wrapper children"
-              >
-                <button
-                  className="md-button-pill-wrapper md-button-simple-wrapper"
-                  data-color="primary"
-                  data-disabled={false}
-                  data-disabled-outline={false}
-                  data-ghost={false}
-                  data-grown={false}
-                  data-inverted={false}
-                  data-outline={true}
-                  data-shallow-disabled={false}
-                  data-size={28}
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onDragStart={[Function]}
-                  onFocus={[Function]}
-                  onKeyDown={[Function]}
-                  onKeyUp={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseEnter={[Function]}
-                  onMouseLeave={[Function]}
-                  onMouseUp={[Function]}
-                  onTouchCancel={[Function]}
-                  onTouchEnd={[Function]}
-                  onTouchMove={[Function]}
-                  onTouchStart={[Function]}
-                  type="button"
+            <ButtonSimple
+              aria-disabled={false}
+              className="md-button-pill-wrapper"
+              data-color="primary"
+              data-disabled={false}
+              data-disabled-outline={false}
+              data-ghost={false}
+              data-grown={false}
+              data-inverted={false}
+              data-outline={true}
+              data-shallow-disabled={false}
+              data-size={28}
+            >
+              <FocusRing>
+                <FocusRing
+                  focusClass="md-focus-ring-wrapper children"
+                  focusRingClass="md-focus-ring-wrapper children"
                 >
-                  <span>
-                    Button
-                  </span>
-                </button>
+                  <button
+                    className="md-button-pill-wrapper md-button-simple-wrapper"
+                    data-color="primary"
+                    data-disabled={false}
+                    data-disabled-outline={false}
+                    data-ghost={false}
+                    data-grown={false}
+                    data-inverted={false}
+                    data-outline={true}
+                    data-shallow-disabled={false}
+                    data-size={28}
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onDragStart={[Function]}
+                    onFocus={[Function]}
+                    onKeyDown={[Function]}
+                    onKeyUp={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseEnter={[Function]}
+                    onMouseLeave={[Function]}
+                    onMouseUp={[Function]}
+                    onTouchCancel={[Function]}
+                    onTouchEnd={[Function]}
+                    onTouchMove={[Function]}
+                    onTouchStart={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Button
+                    </span>
+                  </button>
+                </FocusRing>
               </FocusRing>
-            </FocusRing>
-          </ButtonSimple>
-        </ButtonPill>
+            </ButtonSimple>
+          </ButtonPill>
+        </div>
       </div>
-    </div>
+      <span
+        data-focus-scope-end={true}
+        hidden={true}
+      />
+    </FocusScope>
   </ModalContainer>
 </ToastNotification>
 `;
@@ -343,47 +425,68 @@ exports[`<ToastNotification /> snapshot should match snapshot with className 1`]
   content="Example text"
 >
   <ModalContainer
+    aria-hidden={true}
     aria-label="Some label"
-    ariaModal={false}
+    aria-live="off"
     className="example-class md-toast-notification-wrapper"
+    focusLockProps={
+      Object {
+        "autoFocus": false,
+      }
+    }
     isPadded={true}
-    role="generic"
+    role="alert"
     round={50}
   >
-    <div
-      aria-label="Some label"
-      className="example-class md-toast-notification-wrapper md-modal-container-wrapper"
-      data-color="primary"
-      data-elevation={0}
-      data-exclude-focus={true}
-      data-padded={true}
-      data-round={50}
-      role="generic"
-      tabIndex={-1}
+    <FocusScope
+      autoFocus={false}
+      contain={true}
     >
+      <span
+        data-focus-scope-start={true}
+        hidden={true}
+      />
       <div
-        className="md-toast-notification-body"
+        aria-hidden={true}
+        aria-label="Some label"
+        aria-live="off"
+        className="example-class md-toast-notification-wrapper md-modal-container-wrapper"
+        data-color="primary"
+        data-elevation={0}
+        data-exclude-focus={true}
+        data-padded={true}
+        data-round={50}
+        role="alert"
+        tabIndex={-1}
       >
-        <Text
-          className="example-class md-toast-notification-content"
-          tagName="p"
-          type="body-primary"
+        <div
+          className="md-toast-notification-body"
         >
           <Text
-            className="md-text-wrapper example-class md-toast-notification-content"
-            tagname="p"
-            type="body-large-regular"
+            className="example-class md-toast-notification-content"
+            tagName="p"
+            type="body-primary"
           >
-            <mdc-text
-              class="md-text-wrapper example-class md-toast-notification-content"
-              suppressHydrationWarning={true}
+            <Text
+              className="md-text-wrapper example-class md-toast-notification-content"
+              tagname="p"
+              type="body-large-regular"
             >
-              Example text
-            </mdc-text>
+              <mdc-text
+                class="md-text-wrapper example-class md-toast-notification-content"
+                suppressHydrationWarning={true}
+              >
+                Example text
+              </mdc-text>
+            </Text>
           </Text>
-        </Text>
+        </div>
       </div>
-    </div>
+      <span
+        data-focus-scope-end={true}
+        hidden={true}
+      />
+    </FocusScope>
   </ModalContainer>
 </ToastNotification>
 `;
@@ -395,49 +498,142 @@ exports[`<ToastNotification /> snapshot should match snapshot with id 1`] = `
   id="example-id"
 >
   <ModalContainer
+    aria-hidden={true}
     aria-label="Some label"
-    ariaModal={false}
+    aria-live="off"
     className="md-toast-notification-wrapper"
+    focusLockProps={
+      Object {
+        "autoFocus": false,
+      }
+    }
     id="example-id"
     isPadded={true}
-    role="generic"
+    role="alert"
     round={50}
   >
-    <div
-      aria-label="Some label"
-      className="md-toast-notification-wrapper md-modal-container-wrapper"
-      data-color="primary"
-      data-elevation={0}
-      data-exclude-focus={true}
-      data-padded={true}
-      data-round={50}
-      id="example-id"
-      role="generic"
-      tabIndex={-1}
+    <FocusScope
+      autoFocus={false}
+      contain={true}
     >
+      <span
+        data-focus-scope-start={true}
+        hidden={true}
+      />
       <div
-        className="md-toast-notification-body"
+        aria-hidden={true}
+        aria-label="Some label"
+        aria-live="off"
+        className="md-toast-notification-wrapper md-modal-container-wrapper"
+        data-color="primary"
+        data-elevation={0}
+        data-exclude-focus={true}
+        data-padded={true}
+        data-round={50}
+        id="example-id"
+        role="alert"
+        tabIndex={-1}
       >
-        <Text
-          className="md-toast-notification-content"
-          tagName="p"
-          type="body-primary"
+        <div
+          className="md-toast-notification-body"
         >
           <Text
-            className="md-text-wrapper md-toast-notification-content"
-            tagname="p"
-            type="body-large-regular"
+            className="md-toast-notification-content"
+            tagName="p"
+            type="body-primary"
           >
-            <mdc-text
-              class="md-text-wrapper md-toast-notification-content"
-              suppressHydrationWarning={true}
+            <Text
+              className="md-text-wrapper md-toast-notification-content"
+              tagname="p"
+              type="body-large-regular"
             >
-              Example text
-            </mdc-text>
+              <mdc-text
+                class="md-text-wrapper md-toast-notification-content"
+                suppressHydrationWarning={true}
+              >
+                Example text
+              </mdc-text>
+            </Text>
+          </Text>
+        </div>
+      </div>
+      <span
+        data-focus-scope-end={true}
+        hidden={true}
+      />
+    </FocusScope>
+  </ModalContainer>
+</ToastNotification>
+`;
+
+exports[`<ToastNotification /> snapshot should match snapshot with interruptsUserFlow 1`] = `
+<ToastNotification
+  aria-label="Some label"
+  content="Example text"
+  interruptsUserFlow={true}
+>
+  <ModalContainer
+    aria-label="Some label"
+    aria-live="off"
+    className="md-toast-notification-wrapper"
+    focusLockProps={
+      Object {
+        "autoFocus": true,
+      }
+    }
+    isPadded={true}
+    role="alertdialog"
+    round={50}
+  >
+    <FocusScope
+      autoFocus={true}
+      contain={true}
+    >
+      <span
+        data-focus-scope-start={true}
+        hidden={true}
+      />
+      <div
+        aria-label="Some label"
+        aria-live="off"
+        aria-modal={true}
+        className="md-toast-notification-wrapper md-modal-container-wrapper"
+        data-color="primary"
+        data-elevation={0}
+        data-exclude-focus={true}
+        data-padded={true}
+        data-round={50}
+        role="alertdialog"
+        tabIndex={-1}
+      >
+        <div
+          className="md-toast-notification-body"
+        >
+          <Text
+            className="md-toast-notification-content"
+            tagName="h1"
+            type="body-primary"
+          >
+            <Text
+              className="md-text-wrapper md-toast-notification-content"
+              tagname="h1"
+              type="body-large-regular"
+            >
+              <mdc-text
+                class="md-text-wrapper md-toast-notification-content"
+                suppressHydrationWarning={true}
+              >
+                Example text
+              </mdc-text>
+            </Text>
           </Text>
-        </Text>
+        </div>
       </div>
-    </div>
+      <span
+        data-focus-scope-end={true}
+        hidden={true}
+      />
+    </FocusScope>
   </ModalContainer>
 </ToastNotification>
 `;
@@ -455,75 +651,96 @@ exports[`<ToastNotification /> snapshot should match snapshot with leading visua
   }
 >
   <ModalContainer
+    aria-hidden={true}
     aria-label="Some label"
-    ariaModal={false}
+    aria-live="off"
     className="md-toast-notification-wrapper"
+    focusLockProps={
+      Object {
+        "autoFocus": false,
+      }
+    }
     isPadded={true}
-    role="generic"
+    role="alert"
     round={50}
   >
-    <div
-      aria-label="Some label"
-      className="md-toast-notification-wrapper md-modal-container-wrapper"
-      data-color="primary"
-      data-elevation={0}
-      data-exclude-focus={true}
-      data-padded={true}
-      data-round={50}
-      role="generic"
-      tabIndex={-1}
+    <FocusScope
+      autoFocus={false}
+      contain={true}
     >
+      <span
+        data-focus-scope-start={true}
+        hidden={true}
+      />
       <div
-        className="md-toast-notification-body"
+        aria-hidden={true}
+        aria-label="Some label"
+        aria-live="off"
+        className="md-toast-notification-wrapper md-modal-container-wrapper"
+        data-color="primary"
+        data-elevation={0}
+        data-exclude-focus={true}
+        data-padded={true}
+        data-round={50}
+        role="alert"
+        tabIndex={-1}
       >
         <div
-          className="md-toast-notification-leading-visual"
+          className="md-toast-notification-body"
         >
-          <Icon
-            name="help-circle"
-            scale={24}
-            weight="bold"
+          <div
+            className="md-toast-notification-leading-visual"
           >
-            <div
-              aria-hidden="true"
-              className="md-icon-wrapper md-icon-auto-scales md-icon-scales md-icon-no-shrink"
-              role="img"
+            <Icon
+              name="help-circle"
+              scale={24}
+              weight="bold"
             >
-              <svg
+              <div
                 aria-hidden="true"
-                className=""
-                data-autoscale={false}
-                data-scale={24}
-                data-test="help-circle"
-                fill="currentColor"
-                height="100%"
-                style={Object {}}
-                viewBox="0, 0, 32, 32"
-                width="100%"
-              />
-            </div>
-          </Icon>
-        </div>
-        <Text
-          className="md-toast-notification-content"
-          tagName="p"
-          type="body-primary"
-        >
+                className="md-icon-wrapper md-icon-auto-scales md-icon-scales md-icon-no-shrink"
+                role="img"
+              >
+                <svg
+                  aria-hidden="true"
+                  className=""
+                  data-autoscale={false}
+                  data-scale={24}
+                  data-test="help-circle"
+                  fill="currentColor"
+                  height="100%"
+                  style={Object {}}
+                  viewBox="0, 0, 32, 32"
+                  width="100%"
+                />
+              </div>
+            </Icon>
+          </div>
           <Text
-            className="md-text-wrapper md-toast-notification-content"
-            tagname="p"
-            type="body-large-regular"
+            className="md-toast-notification-content"
+            tagName="p"
+            type="body-primary"
           >
-            <mdc-text
-              class="md-text-wrapper md-toast-notification-content"
-              suppressHydrationWarning={true}
+            <Text
+              className="md-text-wrapper md-toast-notification-content"
+              tagname="p"
+              type="body-large-regular"
             >
-              Example text
-            </mdc-text>
+              <mdc-text
+                class="md-text-wrapper md-toast-notification-content"
+                suppressHydrationWarning={true}
+              >
+                Example text
+              </mdc-text>
+            </Text>
           </Text>
-        </Text>
+        </div>
       </div>
-    </div>
+      <span
+        data-focus-scope-end={true}
+        hidden={true}
+      />
+    </FocusScope>
   </ModalContainer>
 </ToastNotification>
 `;
@@ -538,36 +755,57 @@ exports[`<ToastNotification /> snapshot should match snapshot with non string co
   }
 >
   <ModalContainer
+    aria-hidden={true}
     aria-label="Some label"
-    ariaModal={false}
+    aria-live="off"
     className="md-toast-notification-wrapper"
+    focusLockProps={
+      Object {
+        "autoFocus": false,
+      }
+    }
     isPadded={true}
-    role="generic"
+    role="alert"
     round={50}
   >
-    <div
-      aria-label="Some label"
-      className="md-toast-notification-wrapper md-modal-container-wrapper"
-      data-color="primary"
-      data-elevation={0}
-      data-exclude-focus={true}
-      data-padded={true}
-      data-round={50}
-      role="generic"
-      tabIndex={-1}
+    <FocusScope
+      autoFocus={false}
+      contain={true}
     >
+      <span
+        data-focus-scope-start={true}
+        hidden={true}
+      />
       <div
-        className="md-toast-notification-body"
+        aria-hidden={true}
+        aria-label="Some label"
+        aria-live="off"
+        className="md-toast-notification-wrapper md-modal-container-wrapper"
+        data-color="primary"
+        data-elevation={0}
+        data-exclude-focus={true}
+        data-padded={true}
+        data-round={50}
+        role="alert"
+        tabIndex={-1}
       >
         <div
-          className="md-toast-notification-content"
+          className="md-toast-notification-body"
         >
-          <button>
-            Example text
-          </button>
+          <div
+            className="md-toast-notification-content"
+          >
+            <button>
+              Example text
+            </button>
+          </div>
         </div>
       </div>
-    </div>
+      <span
+        data-focus-scope-end={true}
+        hidden={true}
+      />
+    </FocusScope>
   </ModalContainer>
 </ToastNotification>
 `;
@@ -581,131 +819,223 @@ exports[`<ToastNotification /> snapshot should match snapshot with onClose and c
 >
   <ModalContainer
     aria-label="Some label"
-    ariaModal={false}
+    aria-live="off"
     className="md-toast-notification-wrapper"
+    focusLockProps={
+      Object {
+        "autoFocus": false,
+      }
+    }
     isPadded={true}
-    role="generic"
+    role="status"
     round={50}
   >
-    <div
-      aria-label="Some label"
-      className="md-toast-notification-wrapper md-modal-container-wrapper"
-      data-color="primary"
-      data-elevation={0}
-      data-exclude-focus={true}
-      data-padded={true}
-      data-round={50}
-      role="generic"
-      tabIndex={-1}
+    <FocusScope
+      autoFocus={false}
+      contain={true}
     >
+      <span
+        data-focus-scope-start={true}
+        hidden={true}
+      />
       <div
-        className="md-toast-notification-body"
+        aria-label="Some label"
+        aria-live="off"
+        className="md-toast-notification-wrapper md-modal-container-wrapper"
+        data-color="primary"
+        data-elevation={0}
+        data-exclude-focus={true}
+        data-padded={true}
+        data-round={50}
+        role="status"
+        tabIndex={-1}
       >
-        <Text
-          className="md-toast-notification-content"
-          tagName="p"
-          type="body-primary"
+        <div
+          className="md-toast-notification-body"
         >
           <Text
-            className="md-text-wrapper md-toast-notification-content"
-            tagname="p"
-            type="body-large-regular"
+            className="md-toast-notification-content"
+            tagName="p"
+            type="body-primary"
           >
-            <mdc-text
-              class="md-text-wrapper md-toast-notification-content"
-              suppressHydrationWarning={true}
+            <Text
+              className="md-text-wrapper md-toast-notification-content"
+              tagname="p"
+              type="body-large-regular"
             >
-              Example text
-            </mdc-text>
+              <mdc-text
+                class="md-text-wrapper md-toast-notification-content"
+                suppressHydrationWarning={true}
+              >
+                Example text
+              </mdc-text>
+            </Text>
           </Text>
-        </Text>
-        <div
-          className="md-toast-notification-close-button"
-        >
-          <ButtonCircle
-            aria-label="Close toast"
-            ghost={true}
-            onPress={[Function]}
-            size={20}
+          <div
+            className="md-toast-notification-close-button"
           >
-            <ButtonSimple
-              aria-disabled={false}
+            <ButtonCircle
               aria-label="Close toast"
-              className="md-button-circle-wrapper"
-              data-color="primary"
-              data-disabled={false}
-              data-ghost={true}
-              data-inverted={false}
-              data-multiple-children={false}
-              data-outline={false}
-              data-shallow-disabled={false}
-              data-size={20}
+              ghost={true}
               onPress={[Function]}
+              size={20}
             >
-              <FocusRing>
-                <FocusRing
-                  focusClass="md-focus-ring-wrapper children"
-                  focusRingClass="md-focus-ring-wrapper children"
-                >
-                  <button
-                    aria-label="Close toast"
-                    className="md-button-circle-wrapper md-button-simple-wrapper"
-                    data-color="primary"
-                    data-disabled={false}
-                    data-ghost={true}
-                    data-inverted={false}
-                    data-multiple-children={false}
-                    data-outline={false}
-                    data-shallow-disabled={false}
-                    data-size={20}
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onDragStart={[Function]}
-                    onFocus={[Function]}
-                    onKeyDown={[Function]}
-                    onKeyUp={[Function]}
-                    onMouseDown={[Function]}
-                    onMouseEnter={[Function]}
-                    onMouseLeave={[Function]}
-                    onMouseUp={[Function]}
-                    onTouchCancel={[Function]}
-                    onTouchEnd={[Function]}
-                    onTouchMove={[Function]}
-                    onTouchStart={[Function]}
-                    type="button"
+              <ButtonSimple
+                aria-disabled={false}
+                aria-label="Close toast"
+                className="md-button-circle-wrapper"
+                data-color="primary"
+                data-disabled={false}
+                data-ghost={true}
+                data-inverted={false}
+                data-multiple-children={false}
+                data-outline={false}
+                data-shallow-disabled={false}
+                data-size={20}
+                onPress={[Function]}
+              >
+                <FocusRing>
+                  <FocusRing
+                    focusClass="md-focus-ring-wrapper children"
+                    focusRingClass="md-focus-ring-wrapper children"
                   >
-                    <Icon
-                      name="cancel"
-                      scale={16}
-                      weight="bold"
+                    <button
+                      aria-label="Close toast"
+                      className="md-button-circle-wrapper md-button-simple-wrapper"
+                      data-color="primary"
+                      data-disabled={false}
+                      data-ghost={true}
+                      data-inverted={false}
+                      data-multiple-children={false}
+                      data-outline={false}
+                      data-shallow-disabled={false}
+                      data-size={20}
+                      onBlur={[Function]}
+                      onClick={[Function]}
+                      onDragStart={[Function]}
+                      onFocus={[Function]}
+                      onKeyDown={[Function]}
+                      onKeyUp={[Function]}
+                      onMouseDown={[Function]}
+                      onMouseEnter={[Function]}
+                      onMouseLeave={[Function]}
+                      onMouseUp={[Function]}
+                      onTouchCancel={[Function]}
+                      onTouchEnd={[Function]}
+                      onTouchMove={[Function]}
+                      onTouchStart={[Function]}
+                      type="button"
                     >
-                      <div
-                        aria-hidden="true"
-                        className="md-icon-wrapper md-icon-auto-scales md-icon-scales md-icon-no-shrink"
-                        role="img"
+                      <Icon
+                        name="cancel"
+                        scale={16}
+                        weight="bold"
                       >
-                        <svg
+                        <div
                           aria-hidden="true"
-                          className=""
-                          data-autoscale={false}
-                          data-scale={16}
-                          data-test="cancel"
-                          fill="currentColor"
-                          height="100%"
-                          style={Object {}}
-                          viewBox="0, 0, 32, 32"
-                          width="100%"
-                        />
-                      </div>
-                    </Icon>
-                  </button>
+                          className="md-icon-wrapper md-icon-auto-scales md-icon-scales md-icon-no-shrink"
+                          role="img"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            className=""
+                            data-autoscale={false}
+                            data-scale={16}
+                            data-test="cancel"
+                            fill="currentColor"
+                            height="100%"
+                            style={Object {}}
+                            viewBox="0, 0, 32, 32"
+                            width="100%"
+                          />
+                        </div>
+                      </Icon>
+                    </button>
+                  </FocusRing>
                 </FocusRing>
-              </FocusRing>
-            </ButtonSimple>
-          </ButtonCircle>
+              </ButtonSimple>
+            </ButtonCircle>
+          </div>
+        </div>
+      </div>
+      <span
+        data-focus-scope-end={true}
+        hidden={true}
+      />
+    </FocusScope>
+  </ModalContainer>
+</ToastNotification>
+`;
+
+exports[`<ToastNotification /> snapshot should match snapshot with role 1`] = `
+<ToastNotification
+  aria-label="Some label"
+  content="Example text"
+  role="example-id"
+>
+  <ModalContainer
+    aria-hidden={true}
+    aria-label="Some label"
+    aria-live="off"
+    className="md-toast-notification-wrapper"
+    focusLockProps={
+      Object {
+        "autoFocus": false,
+      }
+    }
+    isPadded={true}
+    role="example-id"
+    round={50}
+  >
+    <FocusScope
+      autoFocus={false}
+      contain={true}
+    >
+      <span
+        data-focus-scope-start={true}
+        hidden={true}
+      />
+      <div
+        aria-hidden={true}
+        aria-label="Some label"
+        aria-live="off"
+        className="md-toast-notification-wrapper md-modal-container-wrapper"
+        data-color="primary"
+        data-elevation={0}
+        data-exclude-focus={true}
+        data-padded={true}
+        data-round={50}
+        role="example-id"
+        tabIndex={-1}
+      >
+        <div
+          className="md-toast-notification-body"
+        >
+          <Text
+            className="md-toast-notification-content"
+            tagName="p"
+            type="body-primary"
+          >
+            <Text
+              className="md-text-wrapper md-toast-notification-content"
+              tagname="p"
+              type="body-large-regular"
+            >
+              <mdc-text
+                class="md-text-wrapper md-toast-notification-content"
+                suppressHydrationWarning={true}
+              >
+                Example text
+              </mdc-text>
+            </Text>
+          </Text>
         </div>
       </div>
-    </div>
+      <span
+        data-focus-scope-end={true}
+        hidden={true}
+      />
+    </FocusScope>
   </ModalContainer>
 </ToastNotification>
 `;
@@ -716,47 +1046,68 @@ exports[`<ToastNotification /> snapshot should match snapshot with string conten
   content="Example text"
 >
   <ModalContainer
+    aria-hidden={true}
     aria-label="Some label"
-    ariaModal={false}
+    aria-live="off"
     className="md-toast-notification-wrapper"
+    focusLockProps={
+      Object {
+        "autoFocus": false,
+      }
+    }
     isPadded={true}
-    role="generic"
+    role="alert"
     round={50}
   >
-    <div
-      aria-label="Some label"
-      className="md-toast-notification-wrapper md-modal-container-wrapper"
-      data-color="primary"
-      data-elevation={0}
-      data-exclude-focus={true}
-      data-padded={true}
-      data-round={50}
-      role="generic"
-      tabIndex={-1}
+    <FocusScope
+      autoFocus={false}
+      contain={true}
     >
+      <span
+        data-focus-scope-start={true}
+        hidden={true}
+      />
       <div
-        className="md-toast-notification-body"
+        aria-hidden={true}
+        aria-label="Some label"
+        aria-live="off"
+        className="md-toast-notification-wrapper md-modal-container-wrapper"
+        data-color="primary"
+        data-elevation={0}
+        data-exclude-focus={true}
+        data-padded={true}
+        data-round={50}
+        role="alert"
+        tabIndex={-1}
       >
-        <Text
-          className="md-toast-notification-content"
-          tagName="p"
-          type="body-primary"
+        <div
+          className="md-toast-notification-body"
         >
           <Text
-            className="md-text-wrapper md-toast-notification-content"
-            tagname="p"
-            type="body-large-regular"
+            className="md-toast-notification-content"
+            tagName="p"
+            type="body-primary"
           >
-            <mdc-text
-              class="md-text-wrapper md-toast-notification-content"
-              suppressHydrationWarning={true}
+            <Text
+              className="md-text-wrapper md-toast-notification-content"
+              tagname="p"
+              type="body-large-regular"
             >
-              Example text
-            </mdc-text>
+              <mdc-text
+                class="md-text-wrapper md-toast-notification-content"
+                suppressHydrationWarning={true}
+              >
+                Example text
+              </mdc-text>
+            </Text>
           </Text>
-        </Text>
+        </div>
       </div>
-    </div>
+      <span
+        data-focus-scope-end={true}
+        hidden={true}
+      />
+    </FocusScope>
   </ModalContainer>
 </ToastNotification>
 `;
@@ -772,11 +1123,17 @@ exports[`<ToastNotification /> snapshot should match snapshot with style 1`] = `
   }
 >
   <ModalContainer
+    aria-hidden={true}
     aria-label="Some label"
-    ariaModal={false}
+    aria-live="off"
     className="md-toast-notification-wrapper"
+    focusLockProps={
+      Object {
+        "autoFocus": false,
+      }
+    }
     isPadded={true}
-    role="generic"
+    role="alert"
     round={50}
     style={
       Object {
@@ -784,45 +1141,60 @@ exports[`<ToastNotification /> snapshot should match snapshot with style 1`] = `
       }
     }
   >
-    <div
-      aria-label="Some label"
-      className="md-toast-notification-wrapper md-modal-container-wrapper"
-      data-color="primary"
-      data-elevation={0}
-      data-exclude-focus={true}
-      data-padded={true}
-      data-round={50}
-      role="generic"
-      style={
-        Object {
-          "color": "pink",
-        }
-      }
-      tabIndex={-1}
+    <FocusScope
+      autoFocus={false}
+      contain={true}
     >
+      <span
+        data-focus-scope-start={true}
+        hidden={true}
+      />
       <div
-        className="md-toast-notification-body"
+        aria-hidden={true}
+        aria-label="Some label"
+        aria-live="off"
+        className="md-toast-notification-wrapper md-modal-container-wrapper"
+        data-color="primary"
+        data-elevation={0}
+        data-exclude-focus={true}
+        data-padded={true}
+        data-round={50}
+        role="alert"
+        style={
+          Object {
+            "color": "pink",
+          }
+        }
+        tabIndex={-1}
       >
-        <Text
-          className="md-toast-notification-content"
-          tagName="p"
-          type="body-primary"
+        <div
+          className="md-toast-notification-body"
         >
           <Text
-            className="md-text-wrapper md-toast-notification-content"
-            tagname="p"
-            type="body-large-regular"
+            className="md-toast-notification-content"
+            tagName="p"
+            type="body-primary"
           >
-            <mdc-text
-              class="md-text-wrapper md-toast-notification-content"
-              suppressHydrationWarning={true}
+            <Text
+              className="md-text-wrapper md-toast-notification-content"
+              tagname="p"
+              type="body-large-regular"
             >
-              Example text
-            </mdc-text>
+              <mdc-text
+                class="md-text-wrapper md-toast-notification-content"
+                suppressHydrationWarning={true}
+              >
+                Example text
+              </mdc-text>
+            </Text>
           </Text>
-        </Text>
+        </div>
       </div>
-    </div>
+      <span
+        data-focus-scope-end={true}
+        hidden={true}
+      />
+    </FocusScope>
   </ModalContainer>
 </ToastNotification>
 `;