Merge remote-tracking branch 'origin/unstable' into tree-states

beacon_node/src/config.rs

@@ -362,6 +362,10 @@ pub fn get_config<E: EthSpec>(
             .map_err(|_| "auto-compact-db takes a boolean".to_string())?;
     }
 
+    if let Some(prune_payloads) = clap_utils::parse_optional(cli_args, "prune-payloads")? {
+        client_config.store.prune_payloads = prune_payloads;
+    }
+
     /*
      * Zero-ports
      *