diff --git a/src/command_modules/azure-cli-batch/HISTORY.rst b/src/command_modules/azure-cli-batch/HISTORY.rst
index 95c95e4f5b7..eea3e41a24f 100644
--- a/src/command_modules/azure-cli-batch/HISTORY.rst
+++ b/src/command_modules/azure-cli-batch/HISTORY.rst
@@ -4,11 +4,11 @@ Release History
 ===============
 
 3.2.1
-++++++
-* Minor fixes
++++++
+* Minor fixes.
 
 3.2.0
-++++++
++++++
 * Updated to Batch SDK 4.1.1.
 * `sdist` is now compatible with wheel 0.31.0
 
diff --git a/src/command_modules/azure-cli-batch/azure/cli/command_modules/batch/_help.py b/src/command_modules/azure-cli-batch/azure/cli/command_modules/batch/_help.py
index d5b8471f525..e5d8364e6ff 100644
--- a/src/command_modules/azure-cli-batch/azure/cli/command_modules/batch/_help.py
+++ b/src/command_modules/azure-cli-batch/azure/cli/command_modules/batch/_help.py
@@ -155,6 +155,11 @@
     short-summary: Manage Batch job schedules.
 """
 
+helps['batch node service-logs'] = """
+    type: group
+    short-summary: Manage the service log files of a Batch compute node.
+"""
+
 helps['batch node user'] = """
     type: group
     short-summary: Manage the user accounts of a Batch compute node.
@@ -221,6 +226,11 @@
     short-summary: View usage metrics of Batch pools.
 """
 
+helps['batch pool node-counts'] = """
+    type: group
+    short-summary: Get node counts for Batch pools.
+"""
+
 helps['batch pool node-agent-skus'] = """
     type: group
     short-summary: Retrieve node agent SKUs of Batch pools using a Virtual Machine Configuration.
diff --git a/src/command_modules/azure-cli-monitor/HISTORY.rst b/src/command_modules/azure-cli-monitor/HISTORY.rst
index 7dabbde20e7..740f3e383a8 100644
--- a/src/command_modules/azure-cli-monitor/HISTORY.rst
+++ b/src/command_modules/azure-cli-monitor/HISTORY.rst
@@ -3,6 +3,10 @@
 Release History
 ===============
 
+0.1.6
++++++
+* Minor fixes.
+
 0.1.5
 +++++
 * Minor fixes.
diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/_help.py b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/_help.py
index 039a24e6680..debe1f87f01 100644
--- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/_help.py
+++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/_help.py
@@ -236,6 +236,10 @@
             type: group
             short-summary: Manage service diagnostic settings.
             """
+helps['monitor diagnostic-settings categories'] = """
+            type: group
+            short-summary: Retrieve service diagnostic settings categories.
+            """
 helps['monitor diagnostic-settings create'] = """
             type: command
             short-summary: Create diagnostic settings for the specified resource.
diff --git a/src/command_modules/azure-cli-monitor/setup.py b/src/command_modules/azure-cli-monitor/setup.py
index fd8899b4bfd..c8c2af5749c 100644
--- a/src/command_modules/azure-cli-monitor/setup.py
+++ b/src/command_modules/azure-cli-monitor/setup.py
@@ -12,7 +12,7 @@
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.1.5"
+VERSION = "0.1.6"
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
     'Intended Audience :: Developers',
diff --git a/src/command_modules/azure-cli-redis/HISTORY.rst b/src/command_modules/azure-cli-redis/HISTORY.rst
index b2835282753..aa3c7e2f263 100644
--- a/src/command_modules/azure-cli-redis/HISTORY.rst
+++ b/src/command_modules/azure-cli-redis/HISTORY.rst
@@ -3,9 +3,13 @@
 Release History
 ===============
 
-0.2.12
+
+0.2.13
 ++++++
+* Deprecated `redis patch-schedule patch-schedule show` in favor of `redis patch-schedule show`.
 
+0.2.12
+++++++
 * `sdist` is now compatible with wheel 0.31.0
 
 0.2.11
diff --git a/src/command_modules/azure-cli-redis/azure/cli/command_modules/redis/_help.py b/src/command_modules/azure-cli-redis/azure/cli/command_modules/redis/_help.py
index 1ef0ac03f38..ad76eef0ffc 100644
--- a/src/command_modules/azure-cli-redis/azure/cli/command_modules/redis/_help.py
+++ b/src/command_modules/azure-cli-redis/azure/cli/command_modules/redis/_help.py
@@ -37,3 +37,9 @@
     type: group
     short-summary: Manage Redis patch schedules.
 """
+
+helps['redis patch-schedule patch-schedule'] = """
+    type: group
+    short-summary: This group is deprecated and will be removed in CLI version 2.0.36.
+        The command, `redis patch-schedule patch-schedule show`, will be replaced with `redis patch-schedule show`'
+"""
diff --git a/src/command_modules/azure-cli-redis/azure/cli/command_modules/redis/commands.py b/src/command_modules/azure-cli-redis/azure/cli/command_modules/redis/commands.py
index 572884ec1f7..cfe88b2febc 100644
--- a/src/command_modules/azure-cli-redis/azure/cli/command_modules/redis/commands.py
+++ b/src/command_modules/azure-cli-redis/azure/cli/command_modules/redis/commands.py
@@ -38,4 +38,5 @@ def load_command_table(self, _):
     with self.command_group('redis patch-schedule', redis_patch) as g:
         g.command('set', 'create_or_update')
         g.command('delete', 'delete')
-        g.command('patch-schedule show', 'get')
+        g.command('show', 'get')
+        g.command('patch-schedule show', 'get', deprecate_info="az redis patch-schedule show")
diff --git a/src/command_modules/azure-cli-redis/setup.py b/src/command_modules/azure-cli-redis/setup.py
index 7ed6a7fde2a..253ccb91a1b 100644
--- a/src/command_modules/azure-cli-redis/setup.py
+++ b/src/command_modules/azure-cli-redis/setup.py
@@ -15,7 +15,7 @@
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.2.12"
+VERSION = "0.2.13"
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
diff --git a/src/command_modules/azure-cli-role/HISTORY.rst b/src/command_modules/azure-cli-role/HISTORY.rst
index 0e6af5dcbc7..32ab22c3e24 100644
--- a/src/command_modules/azure-cli-role/HISTORY.rst
+++ b/src/command_modules/azure-cli-role/HISTORY.rst
@@ -2,13 +2,13 @@
 
 Release History
 ===============
+
 2.0.23
 ++++++
-* Minor changes
+* Minor fixes.
 
 2.0.22
 ++++++
-
 * `sdist` is now compatible with wheel 0.31.0
 
 2.0.21
diff --git a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/_help.py b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/_help.py
index 62f9f9597df..660cd2b5fbd 100644
--- a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/_help.py
+++ b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/_help.py
@@ -117,6 +117,10 @@
     type: command
     short-summary: Get the details of a service principal.
 """
+helps['ad app'] = """
+    type: group
+    short-summary: Manage applications with AAD Graph.
+"""
 helps['ad app delete'] = """
     type: command
     short-summary: Delete an application.
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py
index 77f0b82f0e4..8fd6d559d84 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py
@@ -12,6 +12,11 @@
             az {1} --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
 """
 
+helps['vm secret'] = """
+    type: group
+    short-summary: Manage VM secrets.
+"""
+
 helps['vm secret add'] = """
     type: command
     short-summary: Add a secret to a VM.
diff --git a/tools/automation/cli_linter/linter.py b/tools/automation/cli_linter/linter.py
index b9a61bfa667..ee84c4f5d29 100644
--- a/tools/automation/cli_linter/linter.py
+++ b/tools/automation/cli_linter/linter.py
@@ -70,9 +70,9 @@ def _get_loaded_help_description(self, entry):
 
 
 class LinterManager(object):
-    def __init__(self, command_table=None, help_file_entries=None, loaded_help=None, exclusions={}):
+    def __init__(self, command_table=None, help_file_entries=None, loaded_help=None, exclusions=None):
         self.linter = Linter(command_table=command_table, help_file_entries=help_file_entries, loaded_help=loaded_help)
-        self._exclusions = exclusions
+        self._exclusions = exclusions or {}
         self._rules = {
             'help_file_entries': [],
             'command_groups': [],
diff --git a/tools/automation/cli_linter/rules/command_group_rules.py b/tools/automation/cli_linter/rules/command_group_rules.py
index b50d8081c36..31f74547875 100644
--- a/tools/automation/cli_linter/rules/command_group_rules.py
+++ b/tools/automation/cli_linter/rules/command_group_rules.py
@@ -7,7 +7,6 @@
 from ..linter import RuleError
 
 
-@exclude_from_ci
 @command_group_rule
 def missing_group_help_rule(linter, command_group_name):
     if not linter.get_command_group_help(command_group_name):