diff --git a/styleguide/source/_patterns/01-atoms/04-headings/comp-heading.json b/styleguide/source/_patterns/01-atoms/04-headings/comp-heading.json
index 73fbcad650..25700ee3cc 100644
--- a/styleguide/source/_patterns/01-atoms/04-headings/comp-heading.json
+++ b/styleguide/source/_patterns/01-atoms/04-headings/comp-heading.json
@@ -1,9 +1,9 @@
 {
   "compHeading": {
-    "title": "Title text",
+    "title": "Comp Heading",
     "level": "",
     "color": "",
-    "id": "GUID9827924",
-    "centered": ""
+    "id": "GUID285724897",
+    "centered": false
   }
 }
\ No newline at end of file
diff --git a/styleguide/source/_patterns/01-atoms/04-headings/comp-heading~as-sidebar-heading.json b/styleguide/source/_patterns/01-atoms/04-headings/comp-heading~as-sidebar-heading.json
index 59bb71b283..64dc7b001d 100644
--- a/styleguide/source/_patterns/01-atoms/04-headings/comp-heading~as-sidebar-heading.json
+++ b/styleguide/source/_patterns/01-atoms/04-headings/comp-heading~as-sidebar-heading.json
@@ -1,9 +1,9 @@
 {
   "compHeading": {
-    "title": "Employment",
+    "title": "Comp Heading",
     "sub": true,
     "color": "",
-    "id": "employment",
+    "id": "GUID28357207",
     "centered": false,
     "sidebar": true
   }
diff --git a/styleguide/source/_patterns/01-atoms/04-headings/comp-heading~centered.json b/styleguide/source/_patterns/01-atoms/04-headings/comp-heading~centered.json
index c2a907dbad..e71e5d7c48 100644
--- a/styleguide/source/_patterns/01-atoms/04-headings/comp-heading~centered.json
+++ b/styleguide/source/_patterns/01-atoms/04-headings/comp-heading~centered.json
@@ -1,9 +1,9 @@
 {
   "compHeading": {
-    "title": "Title text",
+    "title": "Comp Heading",
     "sub": false,
     "color": "",
-    "id": "",
+    "id": "GUID248572057",
     "centered": true
   }
 }
\ No newline at end of file
diff --git a/styleguide/source/_patterns/01-atoms/04-headings/comp-heading~subheading.json b/styleguide/source/_patterns/01-atoms/04-headings/comp-heading~subheading.json
index 642333216f..201505e486 100644
--- a/styleguide/source/_patterns/01-atoms/04-headings/comp-heading~subheading.json
+++ b/styleguide/source/_patterns/01-atoms/04-headings/comp-heading~subheading.json
@@ -1,9 +1,9 @@
 {
   "compHeading": {
-    "title": "Title text",
+    "title": "Comp Heading",
     "level": 3,
     "color": "",
     "id": "",
-    "centered": ""
+    "centered": false
   }
 }
\ No newline at end of file
diff --git a/styleguide/source/_patterns/01-atoms/04-headings/comp-heading~yellow.json b/styleguide/source/_patterns/01-atoms/04-headings/comp-heading~yellow.json
index a4ed78accb..434e26c868 100644
--- a/styleguide/source/_patterns/01-atoms/04-headings/comp-heading~yellow.json
+++ b/styleguide/source/_patterns/01-atoms/04-headings/comp-heading~yellow.json
@@ -1,6 +1,6 @@
 {
   "compHeading": {
-    "title": "Title text",
+    "title": "Comp Heading",
     "sub": false,
     "color": "yellow",
     "id": "",
diff --git a/styleguide/source/_patterns/03-organisms/by-author/action-finder.json b/styleguide/source/_patterns/03-organisms/by-author/action-finder.json
index 007a1c6d9c..5eab4e543b 100644
--- a/styleguide/source/_patterns/03-organisms/by-author/action-finder.json
+++ b/styleguide/source/_patterns/03-organisms/by-author/action-finder.json
@@ -3,10 +3,17 @@
     "id": "GUID831741781374893",
     "bgWide":"../../assets/images/placeholder/1600x600-lighthouse-blur.jpg",
     "bgNarrow":"../../assets/images/placeholder/800x800.png",
-    "title": "What Would You Like to Do?",
     "featuredHeading":"Featured:",
     "generalHeading":"All Actions & Guides:",
 
+    "compHeading": {
+      "title": "What Would You Like to Do?",
+      "sub": false,
+      "color": "yellow",
+      "id": "GUID83174178137743892",
+      "centered": false
+    },
+
     "seeAll": null,
 
     "featuredLinks": [{
@@ -19,24 +26,28 @@
       "image": "",
       "text": "Cancel or Transfer a Campsite Reservation",
       "type": "external",
-      "href": "#"
+      "href": "#",
+      "label": ""
     },{
       "image": "",
       "text": "Find Horseback Riding Trails",
       "type": "",
-      "href": "#"
+      "href": "#",
+      "label": ""
     }],
 
     "links": [{
       "image": "",
       "text": "Find a State Park",
       "type": "",
-      "href": "#"
+      "href": "#",
+      "label": ""
     },{
       "image": "",
       "text": "Get a State Park Pass",
       "type": "",
-      "href": "#"
+      "href": "#",
+      "label": ""
     },{
       "image": "../../assets/images/placeholder/130x160.png",
       "text": "Fall Activity Planner",
@@ -47,17 +58,20 @@
       "image": "",
       "text": "Reserve a Campsite",
       "type": "external",
-      "href": "#"
+      "href": "#",
+      "label": ""
     },{
       "image": "",
       "text": "Find Scenic Viewing Areas",
       "type": "",
-      "href": "#"
+      "href": "#",
+      "label": ""
     },{
       "image": "",
       "text": "Download a Trail Map",
       "type": "",
-      "href": "#"
+      "href": "#",
+      "label": ""
     }]
   }
 }
diff --git a/styleguide/source/_patterns/03-organisms/by-author/action-finder.md b/styleguide/source/_patterns/03-organisms/by-author/action-finder.md
index 8af7bdb5f1..e823d873bc 100644
--- a/styleguide/source/_patterns/03-organisms/by-author/action-finder.md
+++ b/styleguide/source/_patterns/03-organisms/by-author/action-finder.md
@@ -5,9 +5,9 @@ A collection of featured and general links
 * Stable as of 5.0.0
 
 ### Pattern Contains
-* Callout Link
-* Illustrated Link
 * Decorative Link
+* Comp Heading
+* Key Actions
 
 ### Variant options
 * [Without a Background](./?p=organisms-action-finder-without-background)
@@ -24,12 +24,12 @@ actionFinder: {
     type: string (image path) / optional / (required with bgNarrow)
   bgNarrow:
     type: string (image path) / optional
-  title:
-    type: string / required
   featuredHeading:
     type: string / required
   generalHeading:
     type: string / required
+  compHeading:
+    type: compHeading / required
 
   seeAll: {
     type: decorativeLink / optional
diff --git a/styleguide/source/_patterns/03-organisms/by-author/action-finder.twig b/styleguide/source/_patterns/03-organisms/by-author/action-finder.twig
index 12ee844199..2ba8d77655 100644
--- a/styleguide/source/_patterns/03-organisms/by-author/action-finder.twig
+++ b/styleguide/source/_patterns/03-organisms/by-author/action-finder.twig
@@ -4,6 +4,8 @@
   {% set noBgClass = "ma__action-finder--no-background" %}
 {% endif %}
 
+{% set titleId = compHeading.id ? : "finder-title-" ~ actionFinder.id %}
+
 <section class="ma__action-finder {{ noBgClass }}" id="{{ actionFinder.id }}">
   {% if actionFinder.bgWide %}
     <style>
@@ -20,40 +22,29 @@
   {% endif %}
   <div class="ma__action-finder__container">
     <header class="ma__action-finder__header">
-      <h2 class="ma__action-finder__title">
-        {{ actionFinder.title }}
-      </h2>
+      {# Backward compatible with 5.7 - replaced h2 with compHeading #}
+      {% set compHeading = actionFinder.compHeading ? : {"title": actionFinder.title, "color":"yellow" } %}
+      {% set compHeading = compHeading|merge({"id": titleId }) %}
+      {% include "@atoms/04-headings/comp-heading.twig" %}
     </header>
     {% if actionFinder.featuredLinks %}
-      {% if actionFinder.featuredHeading %}
-        <h3 class="ma__action-finder__category">{{ actionFinder.featuredHeading }}</h3>
-      {% endif %}
-      <div class="ma__action-finder__items">
-        {% for link in actionFinder.featuredLinks %}
-          {% if link.image %}
-            {% set illustratedLink = link %}
-            {% include "@molecules/illustrated-link.twig" %}
-          {% else %}
-            {% set calloutLink = link %}
-            {% include "@molecules/callout-link.twig" %}
-          {% endif %}
-        {% endfor %}
+      <div class="ma__action-finder__featured-items">
+        {% set keyActions = { "links": actionFinder.featuredLinks, "id": titleId } %}
+        {% if actionFinder.featuredHeading %}
+          <h3 class="ma__action-finder__category" id="featured-{{ actionFinder.id }}">{{ actionFinder.featuredHeading }}</h3>
+          {% set keyActions = keyActions|merge({"id": "featured-" ~ actionFinder.id, }) %}
+        {% endif %}
+        {% include "@organisms/by-author/key-actions.twig" %}
       </div>
     {% endif %}
     {% if actionFinder.links %}
-      {% if actionFinder.generalHeading and actionFinder.featuredLinks %}
-        <h3 class="ma__action-finder__category">{{ actionFinder.generalHeading }}</h3>
-      {% endif %}
-      <div class="ma__action-finder__items ma__action-finder__items--all">
-        {% for link in actionFinder.links %}
-          {% if link.image %}
-            {% set illustratedLink = link %}
-            {% include "@molecules/illustrated-link.twig" %}
-          {% else %}
-            {% set calloutLink = link %}
-            {% include "@molecules/callout-link.twig" %}
-          {% endif %}
-        {% endfor %}
+      <div class="ma__action-finder__all-items">
+        {% set keyActions = { "links": actionFinder.links, "id": titleId } %}
+        {% if actionFinder.generalHeading and actionFinder.featuredLinks %}
+          <h3 class="ma__action-finder__category" id="all-{{ actionFinder.id }}">{{ actionFinder.generalHeading }}</h3>
+          {% set keyActions = keyActions|merge({"id": "all-" ~ actionFinder.id, }) %}
+        {% endif %}
+        {% include "@organisms/by-author/key-actions.twig" %}
       </div>
     {% endif %}
   </div>
diff --git a/styleguide/source/_patterns/03-organisms/by-author/key-actions-with-hidden-heading.md b/styleguide/source/_patterns/03-organisms/by-author/key-actions-with-hidden-heading.md
new file mode 100644
index 0000000000..245de0da2f
--- /dev/null
+++ b/styleguide/source/_patterns/03-organisms/by-author/key-actions-with-hidden-heading.md
@@ -0,0 +1,5 @@
+### Description
+This is a variant of the [Key Actions](./?p=organisms-key-actions) pattern showing an example with the heading visually hidden to provide context for screen readers.
+
+### How to generate
+* set the `hiddenHeading` variable to true
diff --git a/styleguide/source/_patterns/03-organisms/by-author/key-actions.json b/styleguide/source/_patterns/03-organisms/by-author/key-actions.json
index 6dabf9ec86..de5afdbc5e 100644
--- a/styleguide/source/_patterns/03-organisms/by-author/key-actions.json
+++ b/styleguide/source/_patterns/03-organisms/by-author/key-actions.json
@@ -1,18 +1,24 @@
 {
   "keyActions": {
+    "id": "GUID0828340",
+    "hiddenHeading": false,
     "compHeading": {
       "title": "Key Actions",
       "sub": false,
-      "id": "key-action-id"
+      "id": ""
     },
     "links":[{
+      "image": "",
       "text": "Register to Vote",
       "type": "",
-      "href": "#"
+      "href": "#",
+      "label": ""
     },{
+      "image": "",
       "text": "Find a Job",
       "type": "",
-      "href": "#"
+      "href": "#",
+      "label": ""
     },{
       "image": "../../assets/images/placeholder/130x160.png",
       "text": "File for unemployment",
@@ -20,13 +26,17 @@
       "href": "#",
       "label": "Guide:"
     },{
+      "image": "",
       "text": "Learn more about the tax code",
       "type": "",
-      "href": "#"
+      "href": "#",
+      "label": ""
     },{
+      "image": "",
       "text": "Learn more about the tax code",
       "type": "",
-      "href": "#"
+      "href": "#",
+      "label": ""
     }]
   }
 }
diff --git a/styleguide/source/_patterns/03-organisms/by-author/key-actions.md b/styleguide/source/_patterns/03-organisms/by-author/key-actions.md
index 447be93fd7..23476687f4 100644
--- a/styleguide/source/_patterns/03-organisms/by-author/key-actions.md
+++ b/styleguide/source/_patterns/03-organisms/by-author/key-actions.md
@@ -11,19 +11,19 @@ This pattern shows a grid containing a combination of Callout links and Illustra
 * Illustrated Link molecule (optional)
 
 ### Variant options
-* This pattern can also contain Illustrated Links in addition to just Callout Links.
-
+* Can be rendered with the title [visually hidden](./?p=organisms-key-actions-with-hidden-heading) to provide context for screen readers.
 
 ### Variables
 ~~~
-"keyActions": {
-  "compHeading": {
-    "type": compHeading / optional 
-  },
-  sidebarHeading: {
-    type: sidebarHeading / optional
+keyActions: {
+  id: 
+    type: string (unique per page) / optional
+  hiddenHeading: 
+    type: boolean
+  compHeading: {
+    type: compHeading / optional 
   },
-  "links":[{
+  links:[{
     type: array of Callout Links or Illustrated Links / required
   }]
 }
diff --git a/styleguide/source/_patterns/03-organisms/by-author/key-actions.twig b/styleguide/source/_patterns/03-organisms/by-author/key-actions.twig
index bdf43a6bfa..50e7a9c9a4 100644
--- a/styleguide/source/_patterns/03-organisms/by-author/key-actions.twig
+++ b/styleguide/source/_patterns/03-organisms/by-author/key-actions.twig
@@ -3,13 +3,22 @@
   {% set keyActions = keyActions|merge({"compHeading": { "title": keyActions.sidebarHeading.title, "sidebar" : true }}) %}
 {% endif %}
 
-<section class="ma__key-actions">
+{# fallback to compHeading Id value #}
+{% set keyActionId = keyActions.id ? : keyActions.compHeading.id %}
+
+{% set hiddenClass = keyActions.hiddenHeading ? 'ma__key-actions--hidden-heading' : '' %}
+  
+<section class="ma__key-actions {{ hiddenClass }}">
   <div class="ma__key-actions__container">
     {% if keyActions.compHeading %}
-      {% set compHeading = keyActions.compHeading %}
+      {% set compHeading = keyActions.compHeading|merge({"id": keyActionId}) %}
       {% include "@atoms/04-headings/comp-heading.twig" %}
     {% endif %}
-    <div class="ma__key-actions__items" aria-labelledby="{{ keyActions.compHeading.id }}">
+    <div 
+      class="ma__key-actions__items" 
+      {% if keyActionId %}
+        aria-labelledby="{{ keyActionId }}"
+      {% endif %}>
       {% for link in keyActions.links %}
         {% if link.image %}
           {% set illustratedLink = link %}
diff --git a/styleguide/source/_patterns/03-organisms/by-author/key-actions~with-hidden-heading.json b/styleguide/source/_patterns/03-organisms/by-author/key-actions~with-hidden-heading.json
new file mode 100644
index 0000000000..2b26924d07
--- /dev/null
+++ b/styleguide/source/_patterns/03-organisms/by-author/key-actions~with-hidden-heading.json
@@ -0,0 +1,34 @@
+{
+  "keyActions": {
+    "id": "GUID0828340",
+    "hiddenHeading": true,
+    "compHeading": {
+      "title": "Key Actions",
+      "sub": false,
+      "id": ""
+    },
+    "links":[{
+      "text": "Register to Vote",
+      "type": "",
+      "href": "#"
+    },{
+      "text": "Find a Job",
+      "type": "",
+      "href": "#"
+    },{
+      "image": "../../assets/images/placeholder/130x160.png",
+      "text": "File for unemployment",
+      "type": "",
+      "href": "#",
+      "label": "Guide:"
+    },{
+      "text": "Learn more about the tax code",
+      "type": "",
+      "href": "#"
+    },{
+      "text": "Learn more about the tax code",
+      "type": "",
+      "href": "#"
+    }]
+  }
+}
diff --git a/styleguide/source/assets/scss/03-organisms/_action-finder.scss b/styleguide/source/assets/scss/03-organisms/_action-finder.scss
index aa1e5b4027..9f2c93ef35 100644
--- a/styleguide/source/assets/scss/03-organisms/_action-finder.scss
+++ b/styleguide/source/assets/scss/03-organisms/_action-finder.scss
@@ -55,6 +55,7 @@ $action-finder-bp: 900px;
     }
   }
 
+  // Backward compatible with v5.7 - replace title with compHeading
   &__title {
     @include ma-border-decorative;
     padding-bottom: 15px;
@@ -68,17 +69,26 @@ $action-finder-bp: 900px;
     }
   }
 
+  // Backward compatible with v5.7 - replace title with compHeading
   &--no-background &__title {
     margin-right: 0;
+    width: 100%;
+  }
+
+  &--no-background .ma__comp-heading {
     padding: 25px 20px 20px 0;
     transform: skew(30deg);
-    width: 100%;
+
+    &:after {
+      display: none;
+    }
   }
 
   &__category {
     @include ma-h5;
   }
 
+  // Backward compatible with v5.6 - removed search filter
   &__search {
 
     @media ($bp-large-min) {
@@ -103,41 +113,47 @@ $action-finder-bp: 900px;
     }
   }
 
+  // Backward compatible with v5.6 - replaced items with Key Actions
   &__items {
     @include ma-reset-list;
     display: flex;
       flex-wrap: wrap;
       justify-content: stretch;
-  }
 
-  &__items:not(&__items--all) {
-    padding-bottom: 25px;
-  }
 
-  .ma__illustrated-link,
-  .ma__callout-link {
-    display: flex;
-    margin-bottom: 20px;
-    height: auto;
-    width: 100%;
-    flex-grow: 0;
-    flex-shrink: 1;
-    flex-basis: auto;
-
-    @media screen and ($bp-small-min) and ($bp-large-max) {
-      @include span-columns(4 of 8);
-      @include omega(2n);
+    .ma__illustrated-link,
+    .ma__callout-link {
       display: flex;
+      margin-bottom: 20px;
+      height: auto;
+      width: 100%;
+      flex-grow: 0;
+      flex-shrink: 1;
+      flex-basis: auto;
+
+      @media screen and ($bp-small-min) and ($bp-large-max) {
+        @include span-columns(4 of 8);
+        @include omega(2n);
+        display: flex;
+      }
+
+      @media print, ($bp-large-min) {
+        @include span-columns(4 of 12);
+        @include omega(3n);
+        display: flex;
+      }
     }
+  }
 
-    @media print, ($bp-large-min) {
-      @include span-columns(4 of 12);
-      @include omega(3n);
-      display: flex;
-    }
+  // Backward compatible with v5.6 - replaced items with Key Actions
+  &__featured-items,
+  &__items:not(&__items--all) {
+    padding-bottom: 25px;
   }
 
-  &__items--all {
+  // Backward compatible with v5.6 - replaced items with Key Actions
+  &__items--all,
+  &__all-items {
 
     .ma__callout-link {
       border-width: 0;
@@ -148,7 +164,9 @@ $action-finder-bp: 900px;
     }
   }
 
-  &--no-background &__items--all {
+  // Backward compatible with v5.6 - replaced items with Key Actions
+  &--no-background &__items--all,
+  &--no-background &__all-items {
     .ma__callout-link {
       border-width: 3px;
     }
diff --git a/styleguide/source/assets/scss/03-organisms/_key-actions.scss b/styleguide/source/assets/scss/03-organisms/_key-actions.scss
index ef1d44c352..1f82559441 100644
--- a/styleguide/source/assets/scss/03-organisms/_key-actions.scss
+++ b/styleguide/source/assets/scss/03-organisms/_key-actions.scss
@@ -7,6 +7,10 @@
     @include ma-container();
   }
 
+  &--hidden-heading .ma__comp-heading {
+    @include ma-visually-hidden;
+  }
+
   &__items {
 
     @media ($bp-medium-min) {
diff --git a/styleguide/source/assets/scss/06-theme/03-organisms/_action-finder.scss b/styleguide/source/assets/scss/06-theme/03-organisms/_action-finder.scss
index 7755884f8d..ec66cadd77 100644
--- a/styleguide/source/assets/scss/06-theme/03-organisms/_action-finder.scss
+++ b/styleguide/source/assets/scss/06-theme/03-organisms/_action-finder.scss
@@ -25,7 +25,8 @@ $action-finder-border-color: tint($c-theme-primary,50%);
     }
   }
 
-  &__title {
+  &__title, // Backward compatible with v5.7 - replace title with compHeading
+  .ma__comp-heading {
     color: $c-font-inverse;
   }
 
@@ -42,6 +43,7 @@ $action-finder-border-color: tint($c-theme-primary,50%);
     color: $c-font-base;
   }
 
+  // Backward compatible with v5.6 - removed search filter
   &__search {
 
     button {
@@ -53,7 +55,9 @@ $action-finder-border-color: tint($c-theme-primary,50%);
     }
   }
 
-  &__items--all {
+  // Backward compatible with v5.6 - replaced items with Key Actions
+  &__items--all,
+  &__all-items {
     
     .ma__callout-link {
       background-color: $c-white;