diff --git a/packages/react-core/src/components/Alert/Alert.tsx b/packages/react-core/src/components/Alert/Alert.tsx
index 33292e63e40..c3b2c4799d9 100644
--- a/packages/react-core/src/components/Alert/Alert.tsx
+++ b/packages/react-core/src/components/Alert/Alert.tsx
@@ -21,8 +21,10 @@ export interface AlertProps extends Omit<React.HTMLProps<HTMLDivElement>, 'actio
   isInline?: boolean;
   /** Title of the Alert  */
   title: React.ReactNode;
-  /** Action button to put in the Alert. Should be <AlertActionLink> or <AlertActionCloseButton> */
-  action?: React.ReactNode;
+  /** Close button; use the AlertActionCloseButton component  */
+  actionClose?: React.ReactNode;
+  /** Action links; use a single AlertActionLink component or multiple wrapped in an array or React.Fragment */
+  actionLinks?: React.ReactNode;
   /** Content rendered inside the Alert */
   children?: React.ReactNode;
   /** Additional classes added to the Alert  */
@@ -41,7 +43,8 @@ export const Alert: React.FunctionComponent<AlertProps & OUIAProps> = ({
   isLiveRegion = false,
   variantLabel = `${capitalize(variant)} alert:`,
   'aria-label': ariaLabel = `${capitalize(variant)} Alert`,
-  action = null,
+  actionClose,
+  actionLinks,
   title,
   children = '',
   className = '',
@@ -75,12 +78,13 @@ export const Alert: React.FunctionComponent<AlertProps & OUIAProps> = ({
     >
       <AlertIcon variant={variant} />
       <h4 className={css(styles.alertTitle)}>{getHeadingContent}</h4>
+      {actionClose && (
+        <AlertContext.Provider value={{ title, variantLabel }}>
+          <div className={css(styles.alertAction)}>{actionClose}</div>
+        </AlertContext.Provider>
+      )}
       {children && <div className={css(styles.alertDescription)}>{children}</div>}
-      <AlertContext.Provider value={{ title, variantLabel }}>
-        {action && (typeof action === 'object' || typeof action === 'string') && (
-          <div className={css(styles.alertAction)}>{action}</div>
-        )}
-      </AlertContext.Provider>
+      {actionLinks && <div className={css(styles.alertActionGroup)}>{actionLinks}</div>}
     </div>
   );
 };
diff --git a/packages/react-core/src/components/Alert/AlertActionCloseButton.tsx b/packages/react-core/src/components/Alert/AlertActionCloseButton.tsx
index 023edb31001..30352f52b60 100644
--- a/packages/react-core/src/components/Alert/AlertActionCloseButton.tsx
+++ b/packages/react-core/src/components/Alert/AlertActionCloseButton.tsx
@@ -3,7 +3,7 @@ import { Button, ButtonVariant, ButtonProps } from '../Button';
 import TimesIcon from '@patternfly/react-icons/dist/js/icons/times-icon';
 import { AlertContext } from './AlertContext';
 
-interface AlertActionCloseButtonProps extends ButtonProps {
+export interface AlertActionCloseButtonProps extends ButtonProps {
   /** Additional classes added to the AlertActionCloseButton */
   className?: string;
   /** A callback for when the close button is clicked */
diff --git a/packages/react-core/src/components/Alert/AlertActionLink.tsx b/packages/react-core/src/components/Alert/AlertActionLink.tsx
index c947498786f..8f52e6ef055 100644
--- a/packages/react-core/src/components/Alert/AlertActionLink.tsx
+++ b/packages/react-core/src/components/Alert/AlertActionLink.tsx
@@ -13,7 +13,7 @@ export const AlertActionLink: React.FunctionComponent<AlertActionLinkProps> = ({
   children,
   ...props
 }: AlertActionLinkProps) => (
-  <Button variant={ButtonVariant.link} className={className} {...props}>
+  <Button variant={ButtonVariant.link} isInline className={className} {...props}>
     {children}
   </Button>
 );
diff --git a/packages/react-core/src/components/Alert/__tests__/Alert.test.tsx b/packages/react-core/src/components/Alert/__tests__/Alert.test.tsx
index d8e247385e2..b4c4ff3ba83 100644
--- a/packages/react-core/src/components/Alert/__tests__/Alert.test.tsx
+++ b/packages/react-core/src/components/Alert/__tests__/Alert.test.tsx
@@ -37,7 +37,7 @@ Object.values(AlertVariant).forEach(variant => {
 
     test('Action Link', () => {
       const view = mount(
-        <Alert variant={variant} action={<AlertActionLink>test</AlertActionLink>} title="">
+        <Alert variant={variant} actionLinks={[<AlertActionLink>test</AlertActionLink>]} title="">
           Some alert
         </Alert>
       );
@@ -49,7 +49,7 @@ Object.values(AlertVariant).forEach(variant => {
       const view = mount(
         <Alert
           variant={variant}
-          action={<AlertActionCloseButton aria-label="Close" onClose={onClose} />}
+          actionClose={<AlertActionCloseButton aria-label="Close" onClose={onClose} />}
           title={`Sample ${variant} alert`}
         >
           Some alert
@@ -62,7 +62,7 @@ Object.values(AlertVariant).forEach(variant => {
 
     test('Action and Title', () => {
       const view = mount(
-        <Alert variant={variant} action={<AlertActionLink>test</AlertActionLink>} title="Some title">
+        <Alert variant={variant} actionLinks={[<AlertActionLink>test</AlertActionLink>]} title="Some title">
           Some alert
         </Alert>
       );
@@ -74,7 +74,7 @@ Object.values(AlertVariant).forEach(variant => {
         <Alert
           variant={variant}
           aria-label={`Custom aria label for ${variant}`}
-          action={<AlertActionLink>test</AlertActionLink>}
+          actionLinks={[<AlertActionLink>test</AlertActionLink>]}
           title="Some title"
         >
           Some alert
diff --git a/packages/react-core/src/components/Alert/__tests__/Generated/Alert.test.tsx b/packages/react-core/src/components/Alert/__tests__/Generated/Alert.test.tsx
index 6f14fac4c3b..65d864cfb9c 100644
--- a/packages/react-core/src/components/Alert/__tests__/Generated/Alert.test.tsx
+++ b/packages/react-core/src/components/Alert/__tests__/Generated/Alert.test.tsx
@@ -13,7 +13,8 @@ it('Alert should match snapshot (auto-generated)', () => {
       variant={'success'}
       isInline={false}
       title={<div>ReactNode</div>}
-      action={null}
+      actionClose={undefined}
+      actionLinks={[]}
       children={''}
       className={"''"}
       aria-label={'string'}
diff --git a/packages/react-core/src/components/Alert/__tests__/Generated/AlertActionCloseButton.test.tsx b/packages/react-core/src/components/Alert/__tests__/Generated/AlertActionCloseButton.test.tsx
index c5746f35a17..5c0379a6353 100644
--- a/packages/react-core/src/components/Alert/__tests__/Generated/AlertActionCloseButton.test.tsx
+++ b/packages/react-core/src/components/Alert/__tests__/Generated/AlertActionCloseButton.test.tsx
@@ -9,7 +9,12 @@ import {} from '../..';
 
 it('AlertActionCloseButton should match snapshot (auto-generated)', () => {
   const view = shallow(
-    <AlertActionCloseButton className={"''"} onClose={() => undefined as any} aria-label={"''"} variantLabel={"''"} />
+    <AlertActionCloseButton
+      className={"''"}
+      onClose={() => undefined as any}
+      aria-label={"''"}
+      variantLabel={'string'}
+    />
   );
   expect(view).toMatchSnapshot();
 });
diff --git a/packages/react-core/src/components/Alert/__tests__/Generated/AlertActionLink.test.tsx b/packages/react-core/src/components/Alert/__tests__/Generated/AlertActionLink.test.tsx
index cb1265c845d..35ca1fd9f51 100644
--- a/packages/react-core/src/components/Alert/__tests__/Generated/AlertActionLink.test.tsx
+++ b/packages/react-core/src/components/Alert/__tests__/Generated/AlertActionLink.test.tsx
@@ -8,6 +8,6 @@ import { AlertActionLink } from '../../AlertActionLink';
 import {} from '../..';
 
 it('AlertActionLink should match snapshot (auto-generated)', () => {
-  const view = shallow(<AlertActionLink children={"''"} className={"''"} />);
+  const view = shallow(<AlertActionLink children={'string'} className={"''"} />);
   expect(view).toMatchSnapshot();
 });
diff --git a/packages/react-core/src/components/Alert/__tests__/Generated/__snapshots__/Alert.test.tsx.snap b/packages/react-core/src/components/Alert/__tests__/Generated/__snapshots__/Alert.test.tsx.snap
index ec0605b8725..6ed66580c87 100644
--- a/packages/react-core/src/components/Alert/__tests__/Generated/__snapshots__/Alert.test.tsx.snap
+++ b/packages/react-core/src/components/Alert/__tests__/Generated/__snapshots__/Alert.test.tsx.snap
@@ -23,15 +23,8 @@ exports[`Alert should match snapshot (auto-generated) 1`] = `
       ReactNode
     </div>
   </h4>
-  <ContextProvider
-    value={
-      Object {
-        "title": <div>
-          ReactNode
-        </div>,
-        "variantLabel": "string",
-      }
-    }
+  <div
+    className="pf-c-alert__action-group"
   />
 </div>
 `;
diff --git a/packages/react-core/src/components/Alert/__tests__/Generated/__snapshots__/AlertActionLink.test.tsx.snap b/packages/react-core/src/components/Alert/__tests__/Generated/__snapshots__/AlertActionLink.test.tsx.snap
index cf4b274ff48..99614afacf5 100644
--- a/packages/react-core/src/components/Alert/__tests__/Generated/__snapshots__/AlertActionLink.test.tsx.snap
+++ b/packages/react-core/src/components/Alert/__tests__/Generated/__snapshots__/AlertActionLink.test.tsx.snap
@@ -3,8 +3,9 @@
 exports[`AlertActionLink should match snapshot (auto-generated) 1`] = `
 <Button
   className="''"
+  isInline={true}
   variant="link"
 >
-  ''
+  string
 </Button>
 `;
diff --git a/packages/react-core/src/components/Alert/__tests__/__snapshots__/Alert.test.tsx.snap b/packages/react-core/src/components/Alert/__tests__/__snapshots__/Alert.test.tsx.snap
index f7e88d5046e..3874720fc22 100644
--- a/packages/react-core/src/components/Alert/__tests__/__snapshots__/Alert.test.tsx.snap
+++ b/packages/react-core/src/components/Alert/__tests__/__snapshots__/Alert.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`Alert - danger Action Close Button 1`] = `
 <Alert
-  action={
+  actionClose={
     <AlertActionCloseButton
       aria-label="Close"
       onClose={[MockFunction]}
@@ -61,11 +61,6 @@ exports[`Alert - danger Action Close Button 1`] = `
       </span>
       Sample danger alert
     </h4>
-    <div
-      className="pf-c-alert__description"
-    >
-      Some alert
-    </div>
     <div
       className="pf-c-alert__action"
     >
@@ -119,16 +114,23 @@ exports[`Alert - danger Action Close Button 1`] = `
         </Button>
       </AlertActionCloseButton>
     </div>
+    <div
+      className="pf-c-alert__description"
+    >
+      Some alert
+    </div>
   </div>
 </Alert>
 `;
 
 exports[`Alert - danger Action Link 1`] = `
 <Alert
-  action={
-    <AlertActionLink>
-      test
-    </AlertActionLink>
+  actionLinks={
+    Array [
+      <AlertActionLink>
+        test
+      </AlertActionLink>,
+    ]
   }
   title=""
   variant="danger"
@@ -188,17 +190,18 @@ exports[`Alert - danger Action Link 1`] = `
       Some alert
     </div>
     <div
-      className="pf-c-alert__action"
+      className="pf-c-alert__action-group"
     >
       <AlertActionLink>
         <Button
           className=""
+          isInline={true}
           variant="link"
         >
           <button
             aria-disabled={null}
             aria-label={null}
-            className="pf-c-button pf-m-link"
+            className="pf-c-button pf-m-link pf-m-inline"
             data-ouia-component-id={null}
             data-ouia-component-type="PF4/Button"
             data-ouia-safe={true}
@@ -217,10 +220,12 @@ exports[`Alert - danger Action Link 1`] = `
 
 exports[`Alert - danger Action and Title 1`] = `
 <Alert
-  action={
-    <AlertActionLink>
-      test
-    </AlertActionLink>
+  actionLinks={
+    Array [
+      <AlertActionLink>
+        test
+      </AlertActionLink>,
+    ]
   }
   title="Some title"
   variant="danger"
@@ -281,17 +286,18 @@ exports[`Alert - danger Action and Title 1`] = `
       Some alert
     </div>
     <div
-      className="pf-c-alert__action"
+      className="pf-c-alert__action-group"
     >
       <AlertActionLink>
         <Button
           className=""
+          isInline={true}
           variant="link"
         >
           <button
             aria-disabled={null}
             aria-label={null}
-            className="pf-c-button pf-m-link"
+            className="pf-c-button pf-m-link pf-m-inline"
             data-ouia-component-id={null}
             data-ouia-component-type="PF4/Button"
             data-ouia-safe={true}
@@ -310,10 +316,12 @@ exports[`Alert - danger Action and Title 1`] = `
 
 exports[`Alert - danger Custom aria label 1`] = `
 <Alert
-  action={
-    <AlertActionLink>
-      test
-    </AlertActionLink>
+  actionLinks={
+    Array [
+      <AlertActionLink>
+        test
+      </AlertActionLink>,
+    ]
   }
   aria-label="Custom aria label for danger"
   title="Some title"
@@ -375,17 +383,18 @@ exports[`Alert - danger Custom aria label 1`] = `
       Some alert
     </div>
     <div
-      className="pf-c-alert__action"
+      className="pf-c-alert__action-group"
     >
       <AlertActionLink>
         <Button
           className=""
+          isInline={true}
           variant="link"
         >
           <button
             aria-disabled={null}
             aria-label={null}
-            className="pf-c-button pf-m-link"
+            className="pf-c-button pf-m-link pf-m-inline"
             data-ouia-component-id={null}
             data-ouia-component-type="PF4/Button"
             data-ouia-safe={true}
@@ -664,7 +673,7 @@ exports[`Alert - danger inline variation 1`] = `
 
 exports[`Alert - default Action Close Button 1`] = `
 <Alert
-  action={
+  actionClose={
     <AlertActionCloseButton
       aria-label="Close"
       onClose={[MockFunction]}
@@ -723,11 +732,6 @@ exports[`Alert - default Action Close Button 1`] = `
       </span>
       Sample default alert
     </h4>
-    <div
-      className="pf-c-alert__description"
-    >
-      Some alert
-    </div>
     <div
       className="pf-c-alert__action"
     >
@@ -781,16 +785,23 @@ exports[`Alert - default Action Close Button 1`] = `
         </Button>
       </AlertActionCloseButton>
     </div>
+    <div
+      className="pf-c-alert__description"
+    >
+      Some alert
+    </div>
   </div>
 </Alert>
 `;
 
 exports[`Alert - default Action Link 1`] = `
 <Alert
-  action={
-    <AlertActionLink>
-      test
-    </AlertActionLink>
+  actionLinks={
+    Array [
+      <AlertActionLink>
+        test
+      </AlertActionLink>,
+    ]
   }
   title=""
   variant="default"
@@ -850,17 +861,18 @@ exports[`Alert - default Action Link 1`] = `
       Some alert
     </div>
     <div
-      className="pf-c-alert__action"
+      className="pf-c-alert__action-group"
     >
       <AlertActionLink>
         <Button
           className=""
+          isInline={true}
           variant="link"
         >
           <button
             aria-disabled={null}
             aria-label={null}
-            className="pf-c-button pf-m-link"
+            className="pf-c-button pf-m-link pf-m-inline"
             data-ouia-component-id={null}
             data-ouia-component-type="PF4/Button"
             data-ouia-safe={true}
@@ -879,10 +891,12 @@ exports[`Alert - default Action Link 1`] = `
 
 exports[`Alert - default Action and Title 1`] = `
 <Alert
-  action={
-    <AlertActionLink>
-      test
-    </AlertActionLink>
+  actionLinks={
+    Array [
+      <AlertActionLink>
+        test
+      </AlertActionLink>,
+    ]
   }
   title="Some title"
   variant="default"
@@ -943,17 +957,18 @@ exports[`Alert - default Action and Title 1`] = `
       Some alert
     </div>
     <div
-      className="pf-c-alert__action"
+      className="pf-c-alert__action-group"
     >
       <AlertActionLink>
         <Button
           className=""
+          isInline={true}
           variant="link"
         >
           <button
             aria-disabled={null}
             aria-label={null}
-            className="pf-c-button pf-m-link"
+            className="pf-c-button pf-m-link pf-m-inline"
             data-ouia-component-id={null}
             data-ouia-component-type="PF4/Button"
             data-ouia-safe={true}
@@ -972,10 +987,12 @@ exports[`Alert - default Action and Title 1`] = `
 
 exports[`Alert - default Custom aria label 1`] = `
 <Alert
-  action={
-    <AlertActionLink>
-      test
-    </AlertActionLink>
+  actionLinks={
+    Array [
+      <AlertActionLink>
+        test
+      </AlertActionLink>,
+    ]
   }
   aria-label="Custom aria label for default"
   title="Some title"
@@ -1037,17 +1054,18 @@ exports[`Alert - default Custom aria label 1`] = `
       Some alert
     </div>
     <div
-      className="pf-c-alert__action"
+      className="pf-c-alert__action-group"
     >
       <AlertActionLink>
         <Button
           className=""
+          isInline={true}
           variant="link"
         >
           <button
             aria-disabled={null}
             aria-label={null}
-            className="pf-c-button pf-m-link"
+            className="pf-c-button pf-m-link pf-m-inline"
             data-ouia-component-id={null}
             data-ouia-component-type="PF4/Button"
             data-ouia-safe={true}
@@ -1326,7 +1344,7 @@ exports[`Alert - default inline variation 1`] = `
 
 exports[`Alert - info Action Close Button 1`] = `
 <Alert
-  action={
+  actionClose={
     <AlertActionCloseButton
       aria-label="Close"
       onClose={[MockFunction]}
@@ -1385,11 +1403,6 @@ exports[`Alert - info Action Close Button 1`] = `
       </span>
       Sample info alert
     </h4>
-    <div
-      className="pf-c-alert__description"
-    >
-      Some alert
-    </div>
     <div
       className="pf-c-alert__action"
     >
@@ -1443,16 +1456,23 @@ exports[`Alert - info Action Close Button 1`] = `
         </Button>
       </AlertActionCloseButton>
     </div>
+    <div
+      className="pf-c-alert__description"
+    >
+      Some alert
+    </div>
   </div>
 </Alert>
 `;
 
 exports[`Alert - info Action Link 1`] = `
 <Alert
-  action={
-    <AlertActionLink>
-      test
-    </AlertActionLink>
+  actionLinks={
+    Array [
+      <AlertActionLink>
+        test
+      </AlertActionLink>,
+    ]
   }
   title=""
   variant="info"
@@ -1512,17 +1532,18 @@ exports[`Alert - info Action Link 1`] = `
       Some alert
     </div>
     <div
-      className="pf-c-alert__action"
+      className="pf-c-alert__action-group"
     >
       <AlertActionLink>
         <Button
           className=""
+          isInline={true}
           variant="link"
         >
           <button
             aria-disabled={null}
             aria-label={null}
-            className="pf-c-button pf-m-link"
+            className="pf-c-button pf-m-link pf-m-inline"
             data-ouia-component-id={null}
             data-ouia-component-type="PF4/Button"
             data-ouia-safe={true}
@@ -1541,10 +1562,12 @@ exports[`Alert - info Action Link 1`] = `
 
 exports[`Alert - info Action and Title 1`] = `
 <Alert
-  action={
-    <AlertActionLink>
-      test
-    </AlertActionLink>
+  actionLinks={
+    Array [
+      <AlertActionLink>
+        test
+      </AlertActionLink>,
+    ]
   }
   title="Some title"
   variant="info"
@@ -1605,17 +1628,18 @@ exports[`Alert - info Action and Title 1`] = `
       Some alert
     </div>
     <div
-      className="pf-c-alert__action"
+      className="pf-c-alert__action-group"
     >
       <AlertActionLink>
         <Button
           className=""
+          isInline={true}
           variant="link"
         >
           <button
             aria-disabled={null}
             aria-label={null}
-            className="pf-c-button pf-m-link"
+            className="pf-c-button pf-m-link pf-m-inline"
             data-ouia-component-id={null}
             data-ouia-component-type="PF4/Button"
             data-ouia-safe={true}
@@ -1634,10 +1658,12 @@ exports[`Alert - info Action and Title 1`] = `
 
 exports[`Alert - info Custom aria label 1`] = `
 <Alert
-  action={
-    <AlertActionLink>
-      test
-    </AlertActionLink>
+  actionLinks={
+    Array [
+      <AlertActionLink>
+        test
+      </AlertActionLink>,
+    ]
   }
   aria-label="Custom aria label for info"
   title="Some title"
@@ -1699,17 +1725,18 @@ exports[`Alert - info Custom aria label 1`] = `
       Some alert
     </div>
     <div
-      className="pf-c-alert__action"
+      className="pf-c-alert__action-group"
     >
       <AlertActionLink>
         <Button
           className=""
+          isInline={true}
           variant="link"
         >
           <button
             aria-disabled={null}
             aria-label={null}
-            className="pf-c-button pf-m-link"
+            className="pf-c-button pf-m-link pf-m-inline"
             data-ouia-component-id={null}
             data-ouia-component-type="PF4/Button"
             data-ouia-safe={true}
@@ -1988,7 +2015,7 @@ exports[`Alert - info inline variation 1`] = `
 
 exports[`Alert - success Action Close Button 1`] = `
 <Alert
-  action={
+  actionClose={
     <AlertActionCloseButton
       aria-label="Close"
       onClose={[MockFunction]}
@@ -2047,11 +2074,6 @@ exports[`Alert - success Action Close Button 1`] = `
       </span>
       Sample success alert
     </h4>
-    <div
-      className="pf-c-alert__description"
-    >
-      Some alert
-    </div>
     <div
       className="pf-c-alert__action"
     >
@@ -2105,16 +2127,23 @@ exports[`Alert - success Action Close Button 1`] = `
         </Button>
       </AlertActionCloseButton>
     </div>
+    <div
+      className="pf-c-alert__description"
+    >
+      Some alert
+    </div>
   </div>
 </Alert>
 `;
 
 exports[`Alert - success Action Link 1`] = `
 <Alert
-  action={
-    <AlertActionLink>
-      test
-    </AlertActionLink>
+  actionLinks={
+    Array [
+      <AlertActionLink>
+        test
+      </AlertActionLink>,
+    ]
   }
   title=""
   variant="success"
@@ -2174,17 +2203,18 @@ exports[`Alert - success Action Link 1`] = `
       Some alert
     </div>
     <div
-      className="pf-c-alert__action"
+      className="pf-c-alert__action-group"
     >
       <AlertActionLink>
         <Button
           className=""
+          isInline={true}
           variant="link"
         >
           <button
             aria-disabled={null}
             aria-label={null}
-            className="pf-c-button pf-m-link"
+            className="pf-c-button pf-m-link pf-m-inline"
             data-ouia-component-id={null}
             data-ouia-component-type="PF4/Button"
             data-ouia-safe={true}
@@ -2203,10 +2233,12 @@ exports[`Alert - success Action Link 1`] = `
 
 exports[`Alert - success Action and Title 1`] = `
 <Alert
-  action={
-    <AlertActionLink>
-      test
-    </AlertActionLink>
+  actionLinks={
+    Array [
+      <AlertActionLink>
+        test
+      </AlertActionLink>,
+    ]
   }
   title="Some title"
   variant="success"
@@ -2267,17 +2299,18 @@ exports[`Alert - success Action and Title 1`] = `
       Some alert
     </div>
     <div
-      className="pf-c-alert__action"
+      className="pf-c-alert__action-group"
     >
       <AlertActionLink>
         <Button
           className=""
+          isInline={true}
           variant="link"
         >
           <button
             aria-disabled={null}
             aria-label={null}
-            className="pf-c-button pf-m-link"
+            className="pf-c-button pf-m-link pf-m-inline"
             data-ouia-component-id={null}
             data-ouia-component-type="PF4/Button"
             data-ouia-safe={true}
@@ -2296,10 +2329,12 @@ exports[`Alert - success Action and Title 1`] = `
 
 exports[`Alert - success Custom aria label 1`] = `
 <Alert
-  action={
-    <AlertActionLink>
-      test
-    </AlertActionLink>
+  actionLinks={
+    Array [
+      <AlertActionLink>
+        test
+      </AlertActionLink>,
+    ]
   }
   aria-label="Custom aria label for success"
   title="Some title"
@@ -2361,17 +2396,18 @@ exports[`Alert - success Custom aria label 1`] = `
       Some alert
     </div>
     <div
-      className="pf-c-alert__action"
+      className="pf-c-alert__action-group"
     >
       <AlertActionLink>
         <Button
           className=""
+          isInline={true}
           variant="link"
         >
           <button
             aria-disabled={null}
             aria-label={null}
-            className="pf-c-button pf-m-link"
+            className="pf-c-button pf-m-link pf-m-inline"
             data-ouia-component-id={null}
             data-ouia-component-type="PF4/Button"
             data-ouia-safe={true}
@@ -2650,7 +2686,7 @@ exports[`Alert - success inline variation 1`] = `
 
 exports[`Alert - warning Action Close Button 1`] = `
 <Alert
-  action={
+  actionClose={
     <AlertActionCloseButton
       aria-label="Close"
       onClose={[MockFunction]}
@@ -2709,11 +2745,6 @@ exports[`Alert - warning Action Close Button 1`] = `
       </span>
       Sample warning alert
     </h4>
-    <div
-      className="pf-c-alert__description"
-    >
-      Some alert
-    </div>
     <div
       className="pf-c-alert__action"
     >
@@ -2767,16 +2798,23 @@ exports[`Alert - warning Action Close Button 1`] = `
         </Button>
       </AlertActionCloseButton>
     </div>
+    <div
+      className="pf-c-alert__description"
+    >
+      Some alert
+    </div>
   </div>
 </Alert>
 `;
 
 exports[`Alert - warning Action Link 1`] = `
 <Alert
-  action={
-    <AlertActionLink>
-      test
-    </AlertActionLink>
+  actionLinks={
+    Array [
+      <AlertActionLink>
+        test
+      </AlertActionLink>,
+    ]
   }
   title=""
   variant="warning"
@@ -2836,17 +2874,18 @@ exports[`Alert - warning Action Link 1`] = `
       Some alert
     </div>
     <div
-      className="pf-c-alert__action"
+      className="pf-c-alert__action-group"
     >
       <AlertActionLink>
         <Button
           className=""
+          isInline={true}
           variant="link"
         >
           <button
             aria-disabled={null}
             aria-label={null}
-            className="pf-c-button pf-m-link"
+            className="pf-c-button pf-m-link pf-m-inline"
             data-ouia-component-id={null}
             data-ouia-component-type="PF4/Button"
             data-ouia-safe={true}
@@ -2865,10 +2904,12 @@ exports[`Alert - warning Action Link 1`] = `
 
 exports[`Alert - warning Action and Title 1`] = `
 <Alert
-  action={
-    <AlertActionLink>
-      test
-    </AlertActionLink>
+  actionLinks={
+    Array [
+      <AlertActionLink>
+        test
+      </AlertActionLink>,
+    ]
   }
   title="Some title"
   variant="warning"
@@ -2929,17 +2970,18 @@ exports[`Alert - warning Action and Title 1`] = `
       Some alert
     </div>
     <div
-      className="pf-c-alert__action"
+      className="pf-c-alert__action-group"
     >
       <AlertActionLink>
         <Button
           className=""
+          isInline={true}
           variant="link"
         >
           <button
             aria-disabled={null}
             aria-label={null}
-            className="pf-c-button pf-m-link"
+            className="pf-c-button pf-m-link pf-m-inline"
             data-ouia-component-id={null}
             data-ouia-component-type="PF4/Button"
             data-ouia-safe={true}
@@ -2958,10 +3000,12 @@ exports[`Alert - warning Action and Title 1`] = `
 
 exports[`Alert - warning Custom aria label 1`] = `
 <Alert
-  action={
-    <AlertActionLink>
-      test
-    </AlertActionLink>
+  actionLinks={
+    Array [
+      <AlertActionLink>
+        test
+      </AlertActionLink>,
+    ]
   }
   aria-label="Custom aria label for warning"
   title="Some title"
@@ -3023,17 +3067,18 @@ exports[`Alert - warning Custom aria label 1`] = `
       Some alert
     </div>
     <div
-      className="pf-c-alert__action"
+      className="pf-c-alert__action-group"
     >
       <AlertActionLink>
         <Button
           className=""
+          isInline={true}
           variant="link"
         >
           <button
             aria-disabled={null}
             aria-label={null}
-            className="pf-c-button pf-m-link"
+            className="pf-c-button pf-m-link pf-m-inline"
             data-ouia-component-id={null}
             data-ouia-component-type="PF4/Button"
             data-ouia-safe={true}
diff --git a/packages/react-core/src/components/Alert/examples/Alert.md b/packages/react-core/src/components/Alert/examples/Alert.md
index 9b4ba2959f9..70de0f9adf2 100644
--- a/packages/react-core/src/components/Alert/examples/Alert.md
+++ b/packages/react-core/src/components/Alert/examples/Alert.md
@@ -5,213 +5,71 @@ cssPrefix: 'pf-c-alert'
 typescript: true
 propComponents: ['Alert', 'AlertActionCloseButton', 'AlertActionLink']
 ---
+
 import { Alert, AlertActionLink, AlertActionCloseButton } from '@patternfly/react-core';
 import './alert.css';
 
 ## Examples
-```js title=Default
-import React from 'react';
-import { Alert, AlertActionLink, AlertActionCloseButton } from '@patternfly/react-core';
-
-class DefaultAlert extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = { alertOneVisible: true, alertTwoVisible: true };
-    this.hideAlertOne = () => this.setState({ alertOneVisible: false });
-    this.hideAlertTwo = () => this.setState({ alertTwoVisible: false });
-  }
-
-  render() {
-    const { alertOneVisible, alertTwoVisible } = this.state;
-    return (
-      <React.Fragment>
-        {alertOneVisible && (
-          <Alert
-            variant="default"
-            title="Default alert title 1"
-            action={<AlertActionCloseButton onClose={this.hideAlertOne} />}
-          >
-            Info alert description. <a href="#">This is a link.</a>
-          </Alert>
-        )}
-        {alertTwoVisible && (
-          <Alert
-            variant="default"
-            title="Default alert title 2"
-            action={<AlertActionCloseButton onClose={this.hideAlertTwo} />}
-          />
-        )}
-        <Alert
-          variant="default"
-          title="Default alert title 3"
-          action={<AlertActionLink onClick={() => {console.log('Default alert title 3')}}>Action Button</AlertActionLink>}
-          />
-        <Alert variant="default" title="Default alert title 4" />
-      </React.Fragment>
-    );
-  }
-}
-```
 
-```js title=Info
+```js title=Types
 import React from 'react';
-import { Alert, AlertActionLink, AlertActionCloseButton } from '@patternfly/react-core';
-
-class InfoAlert extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = { alertOneVisible: true, alertTwoVisible: true };
-    this.hideAlertOne = () => this.setState({ alertOneVisible: false });
-    this.hideAlertTwo = () => this.setState({ alertTwoVisible: false });
-  }
+import { Alert } from '@patternfly/react-core';
 
+class AlertTypes extends React.Component {
   render() {
-    const { alertOneVisible, alertTwoVisible } = this.state;
     return (
       <React.Fragment>
-        {alertOneVisible && (
-          <Alert
-            variant="info"
-            title="Info alert title 1"
-            action={<AlertActionCloseButton onClose={this.hideAlertOne} />}
-          >
-            Info alert description. <a href="#">This is a link.</a>
-          </Alert>
-        )}
-        {alertTwoVisible && (
-          <Alert
-            variant="info"
-            title="Info alert title 2"
-            action={<AlertActionCloseButton onClose={this.hideAlertTwo} />}
-          />
-        )}
-        <Alert variant="info" title="Info alert title 3" action={<AlertActionLink>Action Button</AlertActionLink>} />
-        <Alert variant="info" title="Info alert title 4" />
+        <Alert title="Default alert title" />
+        <Alert variant="info" title="Info alert title" />
+        <Alert variant="success" title="Success alert title" />
+        <Alert variant="warning" title="Warning alert title" />
+        <Alert variant="danger" title="Danger alert title" />
       </React.Fragment>
     );
   }
 }
 ```
 
-```js title=Success
+```js title=Variations
 import React from 'react';
-import { Alert, AlertActionLink, AlertActionCloseButton } from '@patternfly/react-core';
+import { Alert, AlertActionCloseButton, AlertActionLink } from '@patternfly/react-core';
 
-class SuccessAlert extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = { alertOneVisible: true, alertTwoVisible: true };
-    this.hideAlertOne = () => this.setState({ alertOneVisible: false });
-    this.hideAlertTwo = () => this.setState({ alertTwoVisible: false });
-  }
+class AlertVariations extends React.Component {
   render() {
-    const { alertOneVisible, alertTwoVisible } = this.state;
     return (
       <React.Fragment>
-        {alertOneVisible && (
-          <Alert
-            variant="success"
-            title="Success alert title 1"
-            action={<AlertActionCloseButton onClose={this.hideAlertOne} />}
-          >
-            Success alert description. <a href="#">This is a link.</a>
-          </Alert>
-        )}
-        {alertTwoVisible && (
-          <Alert
-            variant="success"
-            title="Success alert title 2"
-            action={<AlertActionCloseButton onClose={this.hideAlertTwo} />}
-          />
-        )}
         <Alert
           variant="success"
-          title="Success alert title 3"
-          action={<AlertActionLink>Action Button</AlertActionLink>}
-        />
-        <Alert variant="success" title="Success alert title 4" />
-      </React.Fragment>
-    );
-  }
-}
-```
-
-```js title=Warning
-import React from 'react';
-import { Alert, AlertActionLink, AlertActionCloseButton } from '@patternfly/react-core';
-
-class WarningAlert extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = { alertOneVisible: true, alertTwoVisible: true };
-    this.hideAlertOne = () => this.setState({ alertOneVisible: false });
-    this.hideAlertTwo = () => this.setState({ alertTwoVisible: false });
-  }
-  render() {
-    const { alertOneVisible, alertTwoVisible } = this.state;
-    return (
-      <React.Fragment>
-        {alertOneVisible && (
-          <Alert
-            variant="warning"
-            title="Warning alert title 1"
-            action={<AlertActionCloseButton onClose={this.hideAlertOne} />}
-          >
-            Warning alert description. <a href="#">This is a link.</a>
-          </Alert>
-        )}
-        {alertTwoVisible && (
-          <Alert
-            variant="warning"
-            title="Warning alert title 2"
-            action={<AlertActionCloseButton onClose={this.hideAlertTwo} />}
-          />
-        )}
+          title="Success alert title"
+          actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}
+          actionLinks={
+            <React.Fragment>
+              <AlertActionLink onClick={() => alert('Clicked on View details')}>View details</AlertActionLink>
+              <AlertActionLink onClick={() => alert('Clicked on Ignore')}>Ignore</AlertActionLink>
+            </React.Fragment>
+          }
+        >
+          <p>Success alert description. This should tell the user more information about the alert.</p>
+        </Alert>
+        <Alert variant="success" title="Success alert title" actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}>
+          <p>
+            Success alert description. This should tell the user more information about the alert.{' '}
+            <a href="#">This is a link.</a>
+          </p>
+        </Alert>
         <Alert
-          variant="warning"
-          title="Warning alert title 3"
-          action={<AlertActionLink>Action Button</AlertActionLink>}
+          variant="success"
+          title="Success alert title"
+          actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}
+          actionLinks={
+            <React.Fragment>
+              <AlertActionLink onClick={() => alert('Clicked on View details')}>View details</AlertActionLink>
+              <AlertActionLink onClick={() => alert('Clicked on Ignore')}>Ignore</AlertActionLink>
+            </React.Fragment>
+          }
         />
-        <Alert variant="warning" title="Warning alert title 4" />
-      </React.Fragment>
-    );
-  }
-}
-```
-
-```js title=Danger
-import React from 'react';
-import { Alert, AlertActionLink, AlertActionCloseButton } from '@patternfly/react-core';
-
-class DangerAlert extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = { alertOneVisible: true, alertTwoVisible: true };
-    this.hideAlertOne = () => this.setState({ alertOneVisible: false });
-    this.hideAlertTwo = () => this.setState({ alertTwoVisible: false });
-  }
-  render() {
-    const { alertOneVisible, alertTwoVisible } = this.state;
-    return (
-      <React.Fragment>
-        {alertOneVisible && (
-          <Alert
-            variant="danger"
-            title="Danger alert title 1"
-            action={<AlertActionCloseButton onClose={this.hideAlertOne} />}
-          >
-            Danger alert description. <a href="#">This is a link.</a>
-          </Alert>
-        )}
-        {alertTwoVisible && (
-          <Alert
-            variant="danger"
-            title="Danger alert title 2"
-            action={<AlertActionCloseButton onClose={this.hideAlertTwo} />}
-          />
-        )}
-        <Alert variant="danger" title="Danger alert title 3" action={<AlertActionLink>Action Button</AlertActionLink>} />
-        <Alert variant="danger" title="Danger alert title 4" />
+        <Alert variant="success" title="Success alert title" actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />} />
+        <Alert variant="success" title="Success alert title" />
       </React.Fragment>
     );
   }
@@ -226,8 +84,8 @@ class InlineAlert extends React.Component {
   render() {
     return (
       <React.Fragment>
-        <Alert variant="default" isInline title="Default inline alert title"/>
-        <Alert variant="info" isInline title="Info inline alert title"/>
+        <Alert variant="default" isInline title="Default inline alert title" />
+        <Alert variant="info" isInline title="Info inline alert title" />
         <Alert variant="success" isInline title="Success inline alert title" />
         <Alert variant="warning" isInline title="Warning inline alert title" />
         <Alert variant="danger" isInline title="Danger inline alert title" />
@@ -239,45 +97,51 @@ class InlineAlert extends React.Component {
 
 ```js title=Inline-variations
 import React from 'react';
-import { Alert, AlertActionLink, AlertActionCloseButton } from '@patternfly/react-core';
+import { Alert, AlertActionCloseButton, AlertActionLink } from '@patternfly/react-core';
 
 class InlineAlertVariations extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = { alertOneVisible: true, alertTwoVisible: true, renderPropsAlertVisible: true };
-    this.hideAlertOne = () => this.setState({ alertOneVisible: false });
-    this.hideAlertTwo = () => this.setState({ alertTwoVisible: false });
-    this.hideRenderPropsAlertVisible = () => this.setState({ renderPropsAlertVisible: false });
-  }
   render() {
-    const { alertOneVisible, alertTwoVisible, renderPropsAlertVisible } = this.state;
     return (
       <React.Fragment>
-        {alertOneVisible && (
-          <Alert
-            variant="success"
-            isInline
-            title="Success alert example 1"
-            action={<AlertActionCloseButton onClose={this.hideAlertOne} />}
-          >
-            Success alert description. <a href="#">This is a link.</a>
-          </Alert>
-        )}
-        {alertTwoVisible && (
-          <Alert
-            variant="success"
-            isInline
-            title="Success alert example 2"
-            action={<AlertActionCloseButton onClose={this.hideAlertTwo} />}
-          />
-        )}
         <Alert
+          isInline
+          variant="success"
+          title="Success alert title"
+          actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}
+          actionLinks={
+            <React.Fragment>
+              <AlertActionLink onClick={() => alert('Clicked on View details')}>View details</AlertActionLink>
+              <AlertActionLink onClick={() => alert('Clicked on Ignore')}>Ignore</AlertActionLink>
+            </React.Fragment>
+          }
+        >
+          <p>Success alert description. This should tell the user more information about the alert.</p>
+        </Alert>
+        <Alert isInline variant="success" title="Success alert title" actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}>
+          <p>
+            Success alert description. This should tell the user more information about the alert.{' '}
+            <a href="#">This is a link.</a>
+          </p>
+        </Alert>
+        <Alert
+          isInline
           variant="success"
+          title="Success alert title"
+          actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}
+          actionLinks={
+            <React.Fragment>
+              <AlertActionLink onClick={() => alert('Clicked on View details')}>View details</AlertActionLink>
+              <AlertActionLink onClick={() => alert('Clicked on Ignore')}>Ignore</AlertActionLink>
+            </React.Fragment>
+          }
+        />
+        <Alert
           isInline
-          title="Success alert example 3"
-          action={<AlertActionLink>Action Button</AlertActionLink>}
+          variant="success"
+          title="Success alert title"
+          actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}
         />
-        <Alert variant="success" isInline title="Success alert example 4" />
+        <Alert isInline variant="success" title="Success alert title" />
       </React.Fragment>
     );
   }
@@ -286,41 +150,32 @@ class InlineAlertVariations extends React.Component {
 
 ```js title=Static-live-region-alert
 import React from 'react';
-import { Alert, AlertActionLink, AlertActionCloseButton } from '@patternfly/react-core';
+import { Alert, AlertActionCloseButton } from '@patternfly/react-core';
 
 class StaticLiveRegionAlert extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = { alertOneVisible: true, alertTwoVisible: true };
-    this.hideAlertOne = () => this.setState({ alertOneVisible: false });
-    this.hideAlertTwo = () => this.setState({ alertTwoVisible: false });
-  }
-
   render() {
-    const { alertOneVisible, alertTwoVisible } = this.state;
-
     return (
       <React.Fragment>
-        {alertOneVisible && (
-          <Alert
-            isLiveRegion
-            variant="info"
-            title="Default live region configuration"
-            action={<AlertActionCloseButton onClose={this.hideAlertOne} />}>
-            This Alert uses the recommended <code>isLiveRegion</code> prop to automatically sets ARIA attributes and CSS classes.
-          </Alert>
-        )}
-        {alertTwoVisible && (
-          <Alert
-            aria-live="assertive"
-            aria-relevant="additions text"
-            aria-atomic="true"
-            variant="info"
-            title="Customized live region"
-            action={<AlertActionCloseButton onClose={this.hideAlertTwo} />}>
-            You can alternatively omit the <code>isLiveRegion</code> prop to specify ARIA attributes and CSS manually on the containing element.
-          </Alert>
-        )}
+        <Alert
+          isLiveRegion
+          variant="info"
+          title="Default live region configuration"
+          actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}
+        >
+          This Alert uses the recommended <code>isLiveRegion</code> prop to automatically sets ARIA attributes and CSS
+          classes.
+        </Alert>
+        <Alert
+          aria-live="assertive"
+          aria-relevant="additions text"
+          aria-atomic="true"
+          variant="info"
+          title="Customized live region"
+          actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}
+        >
+          You can alternatively omit the <code>isLiveRegion</code> prop to specify ARIA attributes and CSS manually on
+          the containing element.
+        </Alert>
       </React.Fragment>
     );
   }
@@ -336,19 +191,21 @@ class DynamicLiveRegionAlert extends React.Component {
     super();
     this.state = {
       alerts: []
-    }
+    };
   }
 
   render() {
-    const addAlert = (alertProps) => { this.setState({ alerts: [...this.state.alerts, alertProps] }); };
-    const getUniqueId = () => (new Date().getTime());
+    const addAlert = alertProps => {
+      this.setState({ alerts: [...this.state.alerts, alertProps] });
+    };
+    const getUniqueId = () => new Date().getTime();
     const addSuccessAlert = () => {
       addAlert({
         title: 'Single Success Alert',
         variant: 'success',
         isLiveRegion: true,
-        key: getUniqueId(),
-      })
+        key: getUniqueId()
+      });
     };
     const addInfoAlert = () => {
       addAlert({
@@ -357,8 +214,8 @@ class DynamicLiveRegionAlert extends React.Component {
         ariaLive: 'polite',
         ariaRelevant: 'additions text',
         ariaAtomic: 'false',
-        key: getUniqueId(),
-      })
+        key: getUniqueId()
+      });
     };
     const addDangerAlert = () => {
       addAlert({
@@ -367,16 +224,22 @@ class DynamicLiveRegionAlert extends React.Component {
         ariaLive: 'assertive',
         ariaRelevant: 'additions text',
         ariaAtomic: 'false',
-        key: getUniqueId(),
-      })
+        key: getUniqueId()
+      });
     };
     const btnClasses = ['pf-c-button', 'pf-m-secondary'].join(' ');
     return (
       <React.Fragment>
         <InputGroup style={{ marginBottom: '16px' }}>
-          <button onClick={addSuccessAlert} type="button" className={btnClasses}>Add Single Success Alert</button>
-          <button onClick={addInfoAlert} type="button" className={btnClasses}>Add Single Info Alert</button>
-          <button onClick={addDangerAlert} type="button" className={btnClasses}>Add Single Danger Alert</button>
+          <button onClick={addSuccessAlert} type="button" className={btnClasses}>
+            Add Single Success Alert
+          </button>
+          <button onClick={addInfoAlert} type="button" className={btnClasses}>
+            Add Single Info Alert
+          </button>
+          <button onClick={addDangerAlert} type="button" className={btnClasses}>
+            Add Single Danger Alert
+          </button>
         </InputGroup>
         {this.state.alerts.map(({ title, variant, isLiveRegion, ariaLive, ariaRelevant, ariaAtomic, key }) => (
           <Alert
@@ -387,7 +250,7 @@ class DynamicLiveRegionAlert extends React.Component {
             aria-relevant={ariaRelevant}
             aria-atomic={ariaAtomic}
             key={key}
-            />
+          />
         ))}
       </React.Fragment>
     );
@@ -405,13 +268,19 @@ class AsyncLiveRegionAlert extends React.Component {
     this.state = {
       alerts: [],
       timer: null
-    }
-    this.stopAsyncAlerts = () => { clearInterval(this.state.timer); }
+    };
+    this.stopAsyncAlerts = () => {
+      clearInterval(this.state.timer);
+    };
+  }
+  componentWillUnmount() {
+    this.stopAsyncAlerts();
   }
-  componentWillUnmount() { this.stopAsyncAlerts(); }
   render() {
-    const addAlert = (incomingAlerts) => { this.setState({ alerts: [...this.state.alerts, incomingAlerts] }); };
-    const getUniqueId = () => (new Date().getTime());
+    const addAlert = incomingAlerts => {
+      this.setState({ alerts: [...this.state.alerts, incomingAlerts] });
+    };
+    const getUniqueId = () => new Date().getTime();
     const startAsyncAlerts = () => {
       let timerValue = setInterval(() => {
         addAlert({
@@ -421,21 +290,21 @@ class AsyncLiveRegionAlert extends React.Component {
           key: getUniqueId()
         });
       }, 1500);
-      this.setState({timer: timerValue});
+      this.setState({ timer: timerValue });
     };
     const btnClasses = ['pf-c-button', 'pf-m-secondary'].join(' ');
     return (
       <React.Fragment>
         <InputGroup style={{ marginBottom: '16px' }}>
-          <button onClick={startAsyncAlerts} type="button" className={btnClasses}>Start Async Info Alerts</button>
-          <button onClick={this.stopAsyncAlerts} type="button" className={btnClasses}>Stop Async Info Alerts</button>
+          <button onClick={startAsyncAlerts} type="button" className={btnClasses}>
+            Start Async Info Alerts
+          </button>
+          <button onClick={this.stopAsyncAlerts} type="button" className={btnClasses}>
+            Stop Async Info Alerts
+          </button>
         </InputGroup>
         {this.state.alerts.map(({ title, variant, isLiveRegion, key }) => (
-          <Alert
-            variant={variant}
-            title={title}
-            isLiveRegion={isLiveRegion}
-            key={key} />
+          <Alert variant={variant} title={title} isLiveRegion={isLiveRegion} key={key} />
         ))}
       </React.Fragment>
     );
diff --git a/packages/react-core/src/components/AlertGroup/__tests__/AlertGroup.test.tsx b/packages/react-core/src/components/AlertGroup/__tests__/AlertGroup.test.tsx
index f2737d89e0d..78b3b480a42 100644
--- a/packages/react-core/src/components/AlertGroup/__tests__/AlertGroup.test.tsx
+++ b/packages/react-core/src/components/AlertGroup/__tests__/AlertGroup.test.tsx
@@ -61,7 +61,7 @@ test('alertgroup closes when alerts are closed', () => {
       <Alert
         isLiveRegion
         title={'Test Alert'}
-        action={<AlertActionCloseButton aria-label="Close" onClose={onClose} />}
+        actionClose={<AlertActionCloseButton aria-label="Close" onClose={onClose} />}
       />
     </AlertGroup>
   );
diff --git a/packages/react-core/src/components/AlertGroup/__tests__/__snapshots__/AlertGroup.test.tsx.snap b/packages/react-core/src/components/AlertGroup/__tests__/__snapshots__/AlertGroup.test.tsx.snap
index 9ce005dbae9..5295b55fe57 100644
--- a/packages/react-core/src/components/AlertGroup/__tests__/__snapshots__/AlertGroup.test.tsx.snap
+++ b/packages/react-core/src/components/AlertGroup/__tests__/__snapshots__/AlertGroup.test.tsx.snap
@@ -296,7 +296,6 @@ exports[`alertgroup closes when alerts are closed 1`] = `
                 </span>
                 Test Alert
               </h4>
-              
               <div
                 class="pf-c-alert__action"
               >
@@ -323,6 +322,7 @@ exports[`alertgroup closes when alerts are closed 1`] = `
                   </svg>
                 </button>
               </div>
+              
             </div>
           </li>
         </ul>
@@ -375,7 +375,6 @@ exports[`alertgroup closes when alerts are closed 1`] = `
                 </span>
                 Test Alert
               </h4>
-              
               <div
                 class="pf-c-alert__action"
               >
@@ -402,6 +401,7 @@ exports[`alertgroup closes when alerts are closed 1`] = `
                   </svg>
                 </button>
               </div>
+              
             </div>
           </li>
         </ul>
@@ -418,7 +418,7 @@ exports[`alertgroup closes when alerts are closed 1`] = `
           key="0"
         >
           <Alert
-            action={
+            actionClose={
               <AlertActionCloseButton
                 aria-label="Close"
                 onClose={[MockFunction]}
diff --git a/packages/react-core/src/components/AlertGroup/examples/AlertGroup.md b/packages/react-core/src/components/AlertGroup/examples/AlertGroup.md
index ba4feb1fb3f..120f06ef873 100644
--- a/packages/react-core/src/components/AlertGroup/examples/AlertGroup.md
+++ b/packages/react-core/src/components/AlertGroup/examples/AlertGroup.md
@@ -12,15 +12,15 @@ import { Alert, AlertGroup, AlertVariant, AlertActionCloseButton, InputGroup } f
 ## Examples
 ```js title=Static-alert-group
 import * as React from 'react';
-import { Alert, AlertGroup, AlertVariant } from '@patternfly/react-core';
+import { Alert, AlertGroup } from '@patternfly/react-core';
 
 class StaticAlertGroup extends React.Component {
   render() {
     return (
       <React.Fragment>
         <AlertGroup>
-          <Alert title="Success Alert" variant={AlertVariant['success']} isInline />
-          <Alert title="Info Alert" variant={AlertVariant['info']} isInline/>
+          <Alert title="Success Alert" variant="success" isInline />
+          <Alert title="Info Alert" variant="info" isInline/>
         </AlertGroup>
       </React.Fragment>
     );
@@ -63,7 +63,7 @@ class ToastAlertGroup extends React.Component {
               isLiveRegion
               variant={AlertVariant[variant]}
               title={title}
-              action={
+              actionClose={
                 <AlertActionCloseButton
                   title={title}
                   variantLabel={`${variant} alert`}
@@ -116,7 +116,7 @@ class SingularAdditiveAlertGroup extends React.Component {
               variant={AlertVariant[variant]}
               title={title}
               key={key}
-              action={
+              actionClose={
                 <AlertActionCloseButton
                   title={title}
                   variantLabel={`${variant} alert`}
@@ -171,7 +171,7 @@ class MultipleAdditiveAlertGroup extends React.Component {
               variant={AlertVariant[variant]}
               title={title}
               key={key}
-              action={
+              actionClose={
                 <AlertActionCloseButton
                   title={title}
                   variantLabel={`${variant} alert`}
@@ -231,7 +231,7 @@ class AsyncAdditiveAlertGroup extends React.Component {
               variant={AlertVariant[variant]}
               title={title}
               key={key}
-              action={
+              actionClose={
                 <AlertActionCloseButton
                   title={title}
                   variantLabel={`${variant} alert`}
diff --git a/packages/react-core/src/components/Avatar/examples/Avatar.md b/packages/react-core/src/components/Avatar/examples/Avatar.md
index 9a335befbba..cd308c1568a 100644
--- a/packages/react-core/src/components/Avatar/examples/Avatar.md
+++ b/packages/react-core/src/components/Avatar/examples/Avatar.md
@@ -15,5 +15,11 @@ import React from 'react';
 import { Avatar } from '@patternfly/react-core';
 import avatarImg from './examples/avatarImg.svg';
 
-<Avatar src={avatarImg} alt="avatar"></Avatar>
+class AvatarExample extends React.Component {
+  render() {
+    return (
+      <Avatar src={avatarImg} alt="avatar"></Avatar>
+    );
+  }
+}
 ```
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/AlertDemo/AlertDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/AlertDemo/AlertDemo.tsx
index 45eaf6a83b3..206eb70a372 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/AlertDemo/AlertDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/AlertDemo/AlertDemo.tsx
@@ -28,7 +28,7 @@ export class AlertDemo extends React.Component<{}, AlertDemoState> {
             id="info-alert"
             variant="info"
             title="Info alert title"
-            action={<AlertActionCloseButton id="test-button-1" onClose={this.hideAlertOne} />}
+            actionClose={<AlertActionCloseButton id="test-button-1" onClose={this.hideAlertOne} />}
           >
             Info alert description. <a href="#">This is a link.</a>
           </Alert>
@@ -39,7 +39,7 @@ export class AlertDemo extends React.Component<{}, AlertDemoState> {
             id="info-alert"
             variant="info"
             title="Info alert title"
-            action={<AlertActionCloseButton id="test-button-2" onClose={this.hideAlertTwo} />}
+            actionClose={<AlertActionCloseButton id="test-button-2" onClose={this.hideAlertTwo} />}
           >
             Info alert description. <a href="#">This is a link.</a>
           </Alert>
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/AlertGroupDemo/AlertGroupDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/AlertGroupDemo/AlertGroupDemo.tsx
index b50cd9bf3e0..10a1c4bb25d 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/AlertGroupDemo/AlertGroupDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/AlertGroupDemo/AlertGroupDemo.tsx
@@ -68,7 +68,7 @@ export class AlertGroupDemo extends React.Component<{}, AlertGroupDemoState> {
               variant={AlertVariant[variant]}
               title={title}
               key={key}
-              action={<AlertActionCloseButton onClose={() => this.removeAlert(key)} id="test-button" />}
+              actionClose={<AlertActionCloseButton onClose={() => this.removeAlert(key)} id="test-button" />}
             />
           ))}
         </AlertGroup>