Merge remote-tracking branch 'origin/master' into bernhard-fixup2

runtime/parachains/src/inclusion/mod.rs

@@ -522,7 +522,26 @@ impl<T: Config> Pallet<T> {
 			'next_backed_candidate: for (candidate_idx, backed_candidate) in
 				candidates.iter().enumerate()
 			{
-				check_ctx.verify_backed_candidate(parent_hash, candidate_idx, backed_candidate)?;
+				match check_ctx.verify_backed_candidate(
+					parent_hash,
+					parent_storage_root,
+					candidate_idx,
+					backed_candidate,
+				)? {
+					Err(FailedToCreatePVD) => {
+						log::debug!(
+							target: LOG_TARGET,
+							"Failed to create PVD for candidate {} on relay parent {:?}",
+							candidate_idx,
+							parent_hash,
+						);
+						// We don't want to error out here because it will
+						// brick the relay-chain. So we return early without
+						// doing anything.
+						return Ok(ProcessedCandidates::default())
+					},
+					Ok(rpn) => rpn,
+				}
 
 				let para_id = backed_candidate.descriptor().para_id;
 				let mut backers = bitvec::bitvec![BitOrderLsb0, u8; 0; validators.len()];