Merge branch 'unstable' into off-4844

consensus/state_processing/src/per_block_processing.rs

@@ -180,7 +180,15 @@ pub fn per_block_processing<T: EthSpec, Payload: AbstractExecPayload<T>>(
         )?;
     }
 
+<<<<<<< HEAD
     process_blob_kzg_commitments(block.body(), ctxt)?;
+=======
+    // Eip4844 specifications are not yet released so additional care is taken
+    // to ensure the code does not run in production.
+    if matches!(block, BeaconBlockRef::Eip4844(_)) {
+        process_blob_kzg_commitments(block.body())?;
+    }
+>>>>>>> unstable
 
     Ok(())
 }