diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a237bfc49659f..d87f6e3e98266 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -463,30 +463,6 @@ build-macos-subkey:
   tags:
     - osx
 
-build-rust-doc:
-  stage:                           build
-  <<:                              *docker-env
-  <<:                              *test-refs
-  needs:
-    - job:                         test-linux-stable
-      artifacts:                   false
-  variables:
-    <<:                            *default-vars
-    RUSTFLAGS:                     -Dwarnings
-  artifacts:
-    name:                          "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}-doc"
-    when:                          on_success
-    expire_in:                     7 days
-    paths:
-    - ./crate-docs/
-  script:
-    - rm -f ./crate-docs/index.html # use it as an indicator if the job succeeds
-    - SKIP_WASM_BUILD=1 RUSTDOCFLAGS="--html-in-header $(pwd)/.maintain/rustdoc-header.html"
-        time cargo +nightly doc --no-deps --workspace --all-features --verbose
-    - mv ./target/doc ./crate-docs
-    - echo "<meta http-equiv=refresh content=0;url=sc_service/index.html>" > ./crate-docs/index.html
-    - sccache -s
-
 #### stage:                        publish
 
 .build-push-docker-image:          &build-push-docker-image
@@ -567,32 +543,6 @@ publish-s3-release:
     - aws s3 ls s3://${BUCKET}/${PREFIX}/latest/
         --recursive --human-readable --summarize
 
-publish-s3-doc:
-  stage:                           publish
-  image:                           paritytech/awscli:latest
-  allow_failure:                   true
-  needs:
-    - job:                         build-rust-doc
-      artifacts:                   true
-    - job:                         build-linux-substrate
-      artifacts:                   false
-  <<:                              *build-refs
-  <<:                              *kubernetes-build
-  variables:
-    GIT_STRATEGY:                  none
-    BUCKET:                        "releases.parity.io"
-    PREFIX:                        "substrate-rustdoc"
-  script:
-    - test -r ./crate-docs/index.html || (
-        echo "./crate-docs/index.html not present, build:rust:doc:release job not complete";
-        exit 1
-      )
-    - aws s3 sync --delete --size-only --only-show-errors
-        ./crate-docs/ s3://${BUCKET}/${PREFIX}/
-  after_script:
-    - aws s3 ls s3://${BUCKET}/${PREFIX}/
-        --human-readable --summarize
-
 publish-draft-release:
   stage:                           publish
   image:                           paritytech/tools:latest
diff --git a/client/api/src/in_mem.rs b/client/api/src/in_mem.rs
index c108acc7b43b9..b7060cf1d9b1b 100644
--- a/client/api/src/in_mem.rs
+++ b/client/api/src/in_mem.rs
@@ -488,7 +488,6 @@ impl<Block: BlockT> ProvideChtRoots<Block> for Blockchain<Block> {
 /// In-memory operation.
 pub struct BlockImportOperation<Block: BlockT> {
 	pending_block: Option<PendingBlock<Block>>,
-	pending_cache: HashMap<CacheKeyId, Vec<u8>>,
 	old_state: InMemoryBackend<HashFor<Block>>,
 	new_state: Option<<InMemoryBackend<HashFor<Block>> as StateBackend<HashFor<Block>>>::Transaction>,
 	aux: Vec<(Vec<u8>, Option<Vec<u8>>)>,
@@ -520,9 +519,7 @@ impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperatio
 		Ok(())
 	}
 
-	fn update_cache(&mut self, cache: HashMap<CacheKeyId, Vec<u8>>) {
-		self.pending_cache = cache;
-	}
+	fn update_cache(&mut self, _cache: HashMap<CacheKeyId, Vec<u8>>) {}
 
 	fn update_db_storage(
 		&mut self,
@@ -637,7 +634,6 @@ impl<Block: BlockT> backend::Backend<Block> for Backend<Block> where Block::Hash
 		let old_state = self.state_at(BlockId::Hash(Default::default()))?;
 		Ok(BlockImportOperation {
 			pending_block: None,
-			pending_cache: Default::default(),
 			old_state,
 			new_state: None,
 			aux: Default::default(),
diff --git a/client/cli/src/arg_enums.rs b/client/cli/src/arg_enums.rs
index eb033144d7478..4b1f197cf3ea5 100644
--- a/client/cli/src/arg_enums.rs
+++ b/client/cli/src/arg_enums.rs
@@ -170,7 +170,7 @@ impl Into<sc_service::config::RpcMethods> for RpcMethods {
 pub enum Database {
 	/// Facebooks RocksDB
 	RocksDb,
-	/// ParityDb. https://github.com/paritytech/parity-db/
+	/// ParityDb. <https://github.com/paritytech/parity-db/>
 	ParityDb,
 }
 
diff --git a/client/finality-grandpa-warp-sync/src/lib.rs b/client/finality-grandpa-warp-sync/src/lib.rs
index f7ce59b1c168f..e14bcfdd4f323 100644
--- a/client/finality-grandpa-warp-sync/src/lib.rs
+++ b/client/finality-grandpa-warp-sync/src/lib.rs
@@ -14,8 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Helper for handling (i.e. answering) grandpa warp sync requests from a remote peer via the
-//! [`crate::request_responses::RequestResponsesBehaviour`].
+//! Helper for handling (i.e. answering) grandpa warp sync requests from a remote peer.
 
 use codec::Decode;
 use sc_network::config::{IncomingRequest, OutgoingResponse, ProtocolId, RequestResponseConfig};
diff --git a/frame/system/src/limits.rs b/frame/system/src/limits.rs
index 95452bcf51e32..49a458224020c 100644
--- a/frame/system/src/limits.rs
+++ b/frame/system/src/limits.rs
@@ -129,7 +129,7 @@ pub struct WeightsPerClass {
 /// `on_initialize` pallet callbacks are invoked and their cost is added before any extrinsic
 /// is executed. This cost is tracked as `Mandatory` dispatch class.
 ///
-/// ```ignore
+/// ```text,ignore
 /// |   | `max_block`    |   |
 /// |   |                |   |
 /// |   |                |   |
@@ -148,7 +148,7 @@ pub struct WeightsPerClass {
 /// one `Normal`). Each class has it's own limit `max_total`, but also the sum cannot exceed
 /// `max_block` value.
 ///
-/// ```ignore
+/// ```text,ignore
 ///                          -- `Mandatory` limit (unlimited)
 /// | # |                 |   |
 /// | # | `Ext3`          | - - `Operational` limit
@@ -170,7 +170,7 @@ pub struct WeightsPerClass {
 /// out lower-priority `Operational` transactions. In such cases you might add a `reserved` capacity
 /// for given class.
 ///
-/// ```ignore
+/// ```test,ignore
 ///              _
 ///   #           \
 ///   #   `Ext8`   - `reserved`
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index 1e64cd74bc1b3..551f8687b421e 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -575,27 +575,41 @@ where
 	#[cfg(feature = "std")]
 	fn storage_changes_root(&mut self, parent_hash: &[u8]) -> Result<Option<Vec<u8>>, ()> {
 		let _guard = guard();
-		let root = self.overlay.changes_trie_root(
-			self.backend,
-			self.changes_trie_state.as_ref(),
-			Decode::decode(&mut &parent_hash[..]).map_err(|e|
-				trace!(
-					target: "state",
-					"Failed to decode changes root parent hash: {}",
-					e,
-				)
-			)?,
-			true,
-			self.storage_transaction_cache,
-		);
+		if let Some(ref root) = self.storage_transaction_cache.changes_trie_transaction_storage_root {
+			trace!(
+				target: "state",
+				"{:04x}: ChangesRoot({})(cached) {:?}",
+				self.id,
+				HexDisplay::from(&parent_hash),
+				root,
+			);
 
-		trace!(target: "state", "{:04x}: ChangesRoot({}) {:?}",
-			self.id,
-			HexDisplay::from(&parent_hash),
-			root,
-		);
+			Ok(Some(root.encode()))
+		} else {
+			let root = self.overlay.changes_trie_root(
+				self.backend,
+				self.changes_trie_state.as_ref(),
+				Decode::decode(&mut &parent_hash[..]).map_err(|e|
+					trace!(
+						target: "state",
+						"Failed to decode changes root parent hash: {}",
+						e,
+					)
+				)?,
+				true,
+				self.storage_transaction_cache,
+			);
+
+			trace!(
+				target: "state",
+				"{:04x}: ChangesRoot({}) {:?}",
+				self.id,
+				HexDisplay::from(&parent_hash),
+				root,
+			);
 
-		root.map(|r| r.map(|o| o.encode()))
+			root.map(|r| r.map(|o| o.encode()))
+		}
 	}
 
 	fn storage_start_transaction(&mut self) {