diff --git a/etc/glance-api.conf b/etc/glance-api.conf
index a27b9c9a56..9db3f17ec8 100644
--- a/etc/glance-api.conf
+++ b/etc/glance-api.conf
@@ -481,6 +481,7 @@
 #     List of enabled Image Import Methods
 #
 #     'glance-direct', 'copy-image' and 'web-download' are enabled by default.
+#     'glance-download' is available, but requires federated deployments.
 #
 #     Related options:
 #         * [DEFAULT]/node_staging_uri (list value)
@@ -798,20 +799,6 @@
 # backends should be separated using comma. (dict value)
 #enabled_backends = <None>
 
-#
-# The interval in seconds to run periodic job cache_images.
-#
-# The cache_images method will fetch all images which are in queued state
-# for caching in cache directory. The default value is 300.
-#
-# Possible values:
-#     * Positive integer
-#
-# Related options:
-#     * None
-#  (floating point value)
-#cache_prefetcher_interval = 300
-
 # This argument is used internally on Windows. Glance passes a pipe handle to
 # child processes, which is then used for inter-process communication. (string
 # value)
@@ -5120,6 +5107,19 @@
 #auth_section = <None>
 
 
+[os_brick]
+
+#
+# From os_brick
+#
+
+# Directory to use for os-brick lock files. Defaults to
+# oslo_concurrency.lock_path which is a sensible default for compute nodes, but
+# not for HCI deployments or controllers where Glance uses Cinder as a backend,
+# as locks should use the same directory. (string value)
+#lock_path = <None>
+
+
 [oslo_concurrency]
 
 #
@@ -5679,6 +5679,26 @@
 # this option enabled. (boolean value)
 #rabbit_quorum_queue = false
 
+# Each time a message is redelivered to a consumer, a counter is incremented.
+# Once the redelivery count exceeds the delivery limit the message gets dropped
+# or dead-lettered (if a DLX exchange has been configured) Used only when
+# rabbit_quorum_queue is enabled, Default 0 which means dont set a limit.
+# (integer value)
+#rabbit_quorum_delivery_limit = 0
+
+# By default all messages are maintained in memory if a quorum queue grows in
+# length it can put memory pressure on a cluster. This option can limit the
+# number of messages in the quorum queue. Used only when rabbit_quorum_queue is
+# enabled, Default 0 which means dont set a limit. (integer value)
+#rabbit_quroum_max_memory_length = 0
+
+# By default all messages are maintained in memory if a quorum queue grows in
+# length it can put memory pressure on a cluster. This option can limit the
+# number of memory bytes used by the quorum queue. Used only when
+# rabbit_quorum_queue is enabled, Default 0 which means dont set a limit.
+# (integer value)
+#rabbit_quroum_max_memory_bytes = 0
+
 # Positive integer representing duration in seconds for queue TTL (x-expires).
 # Queues which are unused for the duration of the TTL are automatically deleted.
 # The parameter affects only reply and fanout queues. (integer value)
diff --git a/etc/glance-cache.conf b/etc/glance-cache.conf
index 197afcfd71..9aeabff981 100644
--- a/etc/glance-cache.conf
+++ b/etc/glance-cache.conf
@@ -423,6 +423,7 @@
 #     List of enabled Image Import Methods
 #
 #     'glance-direct', 'copy-image' and 'web-download' are enabled by default.
+#     'glance-download' is available, but requires federated deployments.
 #
 #     Related options:
 #         * [DEFAULT]/node_staging_uri (list value)
@@ -2442,6 +2443,19 @@
 #vmware_datastores =
 
 
+[os_brick]
+
+#
+# From os_brick
+#
+
+# Directory to use for os-brick lock files. Defaults to
+# oslo_concurrency.lock_path which is a sensible default for compute nodes, but
+# not for HCI deployments or controllers where Glance uses Cinder as a backend,
+# as locks should use the same directory. (string value)
+#lock_path = <None>
+
+
 [oslo_policy]
 
 #
diff --git a/etc/glance-image-import.conf.sample b/etc/glance-image-import.conf.sample
index 19a64207e4..9439958ae3 100644
--- a/etc/glance-image-import.conf.sample
+++ b/etc/glance-image-import.conf.sample
@@ -1,6 +1,28 @@
 [DEFAULT]
 
 
+[glance_download_opts]
+
+#
+# From glance
+#
+
+#
+# Specify metadata prefix to be set on the target image when using
+# glance-download. All other properties coming from the source image won't be
+# set
+# on the target image. If specified metadata does not exist on the source image
+# it won't be set on the target image. Note you can't set the os_glance prefix
+# as it is reserved by glance, so the related properties won't be set on the
+# target image.
+#
+# Possible values:
+#     * List containing extra_properties prefixes: ['os_', 'architecture']
+#
+#  (list value)
+#extra_properties = [hw_,trait:,os_distro,os_secure_boot,os_type]
+
+
 [image_conversion]
 
 #
diff --git a/etc/glance-scrubber.conf b/etc/glance-scrubber.conf
index 15f168dc27..02a0e32119 100644
--- a/etc/glance-scrubber.conf
+++ b/etc/glance-scrubber.conf
@@ -423,6 +423,7 @@
 #     List of enabled Image Import Methods
 #
 #     'glance-direct', 'copy-image' and 'web-download' are enabled by default.
+#     'glance-download' is available, but requires federated deployments.
 #
 #     Related options:
 #         * [DEFAULT]/node_staging_uri (list value)
@@ -2535,6 +2536,19 @@
 #vmware_datastores =
 
 
+[os_brick]
+
+#
+# From os_brick
+#
+
+# Directory to use for os-brick lock files. Defaults to
+# oslo_concurrency.lock_path which is a sensible default for compute nodes, but
+# not for HCI deployments or controllers where Glance uses Cinder as a backend,
+# as locks should use the same directory. (string value)
+#lock_path = <None>
+
+
 [oslo_concurrency]
 
 #