diff --git a/doc/source/command-objects/volume-service.rst b/doc/source/command-objects/volume-service.rst
index d7495968fb..4fea41fe26 100644
--- a/doc/source/command-objects/volume-service.rst
+++ b/doc/source/command-objects/volume-service.rst
@@ -41,7 +41,8 @@ Set volume service properties
     os volume service set
         [--enable | --disable]
         [--disable-reason <reason>]
-        <host> <service>
+        <host>
+        <service>
 
 .. option:: --enable
 
diff --git a/releasenotes/notes/bug_1602073-5deb58deeafbc8be.yaml b/releasenotes/notes/bug-1602073-5deb58deeafbc8be.yaml
similarity index 100%
rename from releasenotes/notes/bug_1602073-5deb58deeafbc8be.yaml
rename to releasenotes/notes/bug-1602073-5deb58deeafbc8be.yaml
diff --git a/releasenotes/notes/bug-1610883-38929f6fc2eefc9a.yaml b/releasenotes/notes/bug-1610883-38929f6fc2eefc9a.yaml
index 215c24f438..a1bde63eae 100644
--- a/releasenotes/notes/bug-1610883-38929f6fc2eefc9a.yaml
+++ b/releasenotes/notes/bug-1610883-38929f6fc2eefc9a.yaml
@@ -1,8 +1,6 @@
 ---
 features:
   - |
-    Make ``subnet list`` command supports listing up subnets with
-    some filtering options by adding ``--project`` and ``--project-domain``,
-    ``--network``, ``--gateway``,``--name``, ``--subnet-range``
-    options to the command.
+    Add ``--project``, ``--project-domain``, ``--network``, ``--gateway``,
+    ``--name`` and ``--subnet-range`` options to the ``subnet list``  command.
     [Bug `1610883 <https://bugs.launchpad.net/bugs/1610883>`_]
diff --git a/releasenotes/notes/bug-1613926-2d0e405831c0b5a9.yaml b/releasenotes/notes/bug-1613926-2d0e405831c0b5a9.yaml
index fca316c162..2959a268c7 100644
--- a/releasenotes/notes/bug-1613926-2d0e405831c0b5a9.yaml
+++ b/releasenotes/notes/bug-1613926-2d0e405831c0b5a9.yaml
@@ -1,8 +1,7 @@
 ---
 features:
   - |
-    Make ``subnet pool list`` command supports listing up subnets with
-    some filtering options by adding ``--share`` and ``--no-share``,
-    ``--project`` and ``--project-domain``, ``--default`` and ``--no-default``,
-    ``--name``, ``--address-scope`` options to the command.
+    Add ``--share``, ``--no-share``, ``--project``, ``--project-domain``,
+    ``--default``, ``--no-default``, ``--name`` and ``--address-scope``
+    options to the ``subnet pool list`` command.
     [Bug `1613926 <https://bugs.launchpad.net/bugs/1613926>`_]
diff --git a/releasenotes/notes/bug-1622565-2e715aff8b054401.yaml b/releasenotes/notes/bug-1622565-2e715aff8b054401.yaml
new file mode 100644
index 0000000000..9e63a5f3d2
--- /dev/null
+++ b/releasenotes/notes/bug-1622565-2e715aff8b054401.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fix ``--long`` option in ``router list`` command for deployments without
+    the ``router_availability_zone`` extension is not enabled.
+    [Bug `1622565 <https://bugs.launchpad.net/bugs/1622565>`_]
diff --git a/releasenotes/notes/bug-1624085-7cf296649277f405.yaml b/releasenotes/notes/bug-1624085-7cf296649277f405.yaml
new file mode 100644
index 0000000000..40b019a17b
--- /dev/null
+++ b/releasenotes/notes/bug-1624085-7cf296649277f405.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - Fix missing ``_username`` attribute error in ``server ssh`` command.
+    [Bug `1624085 <https://bugs.launchpad.net/python-openstackclient/+bug/1624085>`_]