diff --git a/nifi-docs/src/main/asciidoc/user-guide.adoc b/nifi-docs/src/main/asciidoc/user-guide.adoc
index 085785eee8..c66f70c52e 100644
--- a/nifi-docs/src/main/asciidoc/user-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/user-guide.adoc
@@ -47,6 +47,8 @@ Browser Support
 Current and Current - 1 indicates that the UI is supported in the current stable release of that browser and the preceding one. For instance, if
 the current stable release is 45.X then the officially supported versions will be 45.X and 44.X.
 
+For Safari, which releases major versions much less frequently, Current and Current - 1 simply represent the two latest releases.
+
 The supported browser versions are driven by the capabilities the UI employs and the dependencies it uses. UI features will be developed and tested
 against the supported browsers. Any problem using a supported browser should be reported to Apache NiFi.
 
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp
index f84f050b3d..6be880394c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp
@@ -61,5 +61,7 @@
             Last updated:&nbsp;<span id="process-group-configuration-last-refreshed" class="last-refreshed"></span>
         </div>
         <div id="process-group-configuration-loading-container" class="loading-container"></div>
+        <div id="flow-cs-availability" class="hidden">Listed services are available to all descendant Processors and services of this Process Group.</div>
+        <div class="clear"></div>
     </div>
 </div>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp
index 57702fcace..9bbb3aad9b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp
@@ -70,5 +70,7 @@
             Last updated:&nbsp;<span id="settings-last-refreshed" class="value-color"></span>
         </div>
         <div id="settings-loading-container" class="loading-container"></div>
+        <div id="controller-cs-availability" class="hidden">Listed services are available to all Reporting Tasks and services defined in the Controller Settings.</div>
+        <div class="clear"></div>
     </div>
 </div>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css
index 520e3e0d84..f9b0ed5a0a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css
@@ -44,6 +44,7 @@
     position: absolute;
     bottom: 20px;
     left: 0px;
+    right: 0px;
     height: 32px;
 }
 
@@ -65,6 +66,14 @@
     font-weight: 500;
 }
 
+#flow-cs-availability {
+    float: right;
+    margin-top: 8px;
+    color: #775351;
+    font-family: Roboto;
+    font-size: 13px;
+}
+
 /* general */
 
 #general-process-group-configuration input, #general-process-group-configuration textarea {
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css
index 459c006beb..5fde2fbf20 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css
@@ -35,7 +35,7 @@ div.settings-header-text {
 div.settings-container {
     position: absolute;
     top: 58px;
-    bottom: 0px;
+    bottom: 52px;
     left: 0px;
     right: 0px;
 }
@@ -49,6 +49,7 @@ div.settings-container {
     bottom: 20px;
     right: 0px;
     left: 0px;
+    height: 32px;
 }
 
 /* settings tabs */
@@ -94,6 +95,14 @@ div.settings-refresh-button {
     font-weight: 500;
 }
 
+#controller-cs-availability {
+    float: right;
+    margin-top: 8px;
+    color: #775351;
+    font-family: Roboto;
+    font-size: 13px;
+}
+
 /* general */
 
 #general-settings input {
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
index 42578cefd3..2ca92260fc 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
@@ -288,6 +288,7 @@
 
                     var tab = $(this).text();
                     if (tab === 'General') {
+                        $('#flow-cs-availability').hide();
                         $('#add-process-group-configuration-controller-service').hide();
 
                         if (canWrite) {
@@ -296,6 +297,7 @@
                             $('#process-group-configuration-save').hide();
                         }
                     } else {
+                        $('#flow-cs-availability').show();
                         $('#process-group-configuration-save').hide();
 
                         if (canWrite) {
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
index 9af798869b..fa7afbd933 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
@@ -1146,6 +1146,7 @@
                 select: function () {
                     var tab = $(this).text();
                     if (tab === 'General') {
+                        $('#controller-cs-availability').hide();
                         $('#new-service-or-task').hide();
                         $('#settings-save').show();
                     } else {
@@ -1174,6 +1175,12 @@
                             $('div.controller-settings-table').css('top', '0');
                         }
 
+                        if (tab === 'Controller Services') {
+                            $('#controller-cs-availability').show();
+                        } else if (tab === 'Reporting Tasks') {
+                            $('#controller-cs-availability').hide();
+                        }
+
                         // resize the table
                         nfSettings.resetTableSize();
                     }