diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb965bfb10..379c87ee08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+- Add `--ephemery` network support for Ephemery Testnet [#7563](https://github.com/hyperledger/besu/pull/7563) thanks to [@gconnect](https://github.com/gconnect)
+- Add configuration of Consolidation Request Contract Address via genesis configuration [#7647](https://github.com/hyperledger/besu/pull/7647)
 
 ### Upcoming Breaking Changes
 - k8s (KUBERNETES) Nat method is now deprecated and will be removed in a future release
@@ -16,7 +18,8 @@
 - Add configuration of Consolidation Request Contract Address via genesis configuration [#7647](https://github.com/hyperledger/besu/pull/7647)
 - Interrupt pending transaction processing on block creation timeout [#7673](https://github.com/hyperledger/besu/pull/7673)
 - Align gas cap calculation for transaction simulation to Geth approach [#7703](https://github.com/hyperledger/besu/pull/7703)
-- Expose chainId in the `BlockchainService` [7702](https://github.com/hyperledger/besu/pull/7702)
+- Expose chainId in the `BlockchainService` [#7702](https://github.com/hyperledger/besu/pull/7702)
+- Add support for `chainId` in `CallParameters` [#7720](https://github.com/hyperledger/besu/pull/7720)
 
 ### Bug fixes
 - Fix mounted data path directory permissions for besu user [#7575](https://github.com/hyperledger/besu/pull/7575)
@@ -4461,7 +4464,6 @@ Specify `*` or `all` for `--host-whitelist` to effectively disable host protecti
  - Send client quitting disconnect message to peers on shutdown (PR [#253](https://github.com/PegaSysEng/pantheon/pull/253))
  - Improved error message for port conflict error (PR [#232](https://github.com/PegaSysEng/pantheon/pull/232))
 
-
  ### Technical Improvements
  - Upgraded Ethereum reference tests to 6.0 beta 2. (thanks to [@jvirtanen](https://github.com/jvirtanen) for the initial upgrade to beta 1)
  - Set Java compiler default encoding to UTF-8 (PR [#238](https://github.com/PegaSysEng/pantheon/pull/238) thanks to [@matt9ucci](https://github.com/matt9ucci))
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java
index 4e48be0401..21ca45070b 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java
@@ -18,7 +18,7 @@ import static java.util.Collections.unmodifiableList;
 import static org.apache.tuweni.io.file.Files.copyResource;
 
 import org.hyperledger.besu.cli.config.NetworkName;
-import org.hyperledger.besu.config.MergeConfigOptions;
+import org.hyperledger.besu.config.MergeConfiguration;
 import org.hyperledger.besu.crypto.KeyPair;
 import org.hyperledger.besu.crypto.KeyPairUtil;
 import org.hyperledger.besu.datatypes.Address;
@@ -228,7 +228,7 @@ public class BesuNode implements NodeConfiguration, RunnableNode, AutoCloseable
         });
     this.requestedPlugins = requestedPlugins;
     engineRpcConfiguration.ifPresent(
-        config -> MergeConfigOptions.setMergeEnabled(config.isEnabled()));
+        config -> MergeConfiguration.setMergeEnabled(config.isEnabled()));
     this.extraCLIOptions = extraCLIOptions;
     this.staticNodes = staticNodes;
     this.isDnsEnabled = isDnsEnabled;
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
index fa59f48dd7..41402fa04b 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
@@ -20,6 +20,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static org.hyperledger.besu.cli.DefaultCommandValues.getDefaultBesuDataPath;
+import static org.hyperledger.besu.cli.config.NetworkName.EPHEMERY;
 import static org.hyperledger.besu.cli.config.NetworkName.MAINNET;
 import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPENDENCY_WARNING_MSG;
 import static org.hyperledger.besu.cli.util.CommandLineUtils.isOptionSet;
@@ -50,7 +51,7 @@ import org.hyperledger.besu.cli.options.stable.EthstatsOptions;
 import org.hyperledger.besu.cli.options.stable.GraphQlOptions;
 import org.hyperledger.besu.cli.options.stable.JsonRpcHttpOptions;
 import org.hyperledger.besu.cli.options.stable.LoggingLevelOption;
-import org.hyperledger.besu.cli.options.stable.MetricsOptionGroup;
+import org.hyperledger.besu.cli.options.stable.MetricsOptions;
 import org.hyperledger.besu.cli.options.stable.NodePrivateKeyFileOption;
 import org.hyperledger.besu.cli.options.stable.P2PDiscoveryOptions;
 import org.hyperledger.besu.cli.options.stable.PermissionsOptions;
@@ -62,7 +63,6 @@ import org.hyperledger.besu.cli.options.unstable.EthProtocolOptions;
 import org.hyperledger.besu.cli.options.unstable.EvmOptions;
 import org.hyperledger.besu.cli.options.unstable.InProcessRpcOptions;
 import org.hyperledger.besu.cli.options.unstable.IpcOptions;
-import org.hyperledger.besu.cli.options.unstable.MetricsCLIOptions;
 import org.hyperledger.besu.cli.options.unstable.NatOptions;
 import org.hyperledger.besu.cli.options.unstable.NativeLibraryOptions;
 import org.hyperledger.besu.cli.options.unstable.NetworkingOptions;
@@ -89,7 +89,7 @@ import org.hyperledger.besu.components.BesuComponent;
 import org.hyperledger.besu.config.CheckpointConfigOptions;
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.config.GenesisConfigOptions;
-import org.hyperledger.besu.config.MergeConfigOptions;
+import org.hyperledger.besu.config.MergeConfiguration;
 import org.hyperledger.besu.controller.BesuController;
 import org.hyperledger.besu.controller.BesuControllerBuilder;
 import org.hyperledger.besu.crypto.Blake2bfMessageDigest;
@@ -196,6 +196,7 @@ import org.hyperledger.besu.services.TransactionPoolValidatorServiceImpl;
 import org.hyperledger.besu.services.TransactionSelectionServiceImpl;
 import org.hyperledger.besu.services.TransactionSimulationServiceImpl;
 import org.hyperledger.besu.services.kvstore.InMemoryStoragePlugin;
+import org.hyperledger.besu.util.EphemeryGenesisUpdater;
 import org.hyperledger.besu.util.InvalidConfigurationException;
 import org.hyperledger.besu.util.LogConfigurator;
 import org.hyperledger.besu.util.NetworkUtility;
@@ -246,7 +247,6 @@ import com.google.common.collect.ImmutableMap;
 import io.vertx.core.Vertx;
 import io.vertx.core.VertxOptions;
 import io.vertx.core.json.DecodeException;
-import io.vertx.core.metrics.MetricsOptions;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.UInt256;
 import org.slf4j.Logger;
@@ -295,7 +295,6 @@ public class BesuCommand implements DefaultCommandValues, Runnable {
   final NetworkingOptions unstableNetworkingOptions = NetworkingOptions.create();
   final SynchronizerOptions unstableSynchronizerOptions = SynchronizerOptions.create();
   final EthProtocolOptions unstableEthProtocolOptions = EthProtocolOptions.create();
-  final MetricsCLIOptions unstableMetricsCLIOptions = MetricsCLIOptions.create();
   private final DnsOptions unstableDnsOptions = DnsOptions.create();
   private final NatOptions unstableNatOptions = NatOptions.create();
   private final NativeLibraryOptions unstableNativeLibraryOptions = NativeLibraryOptions.create();
@@ -584,7 +583,7 @@ public class BesuCommand implements DefaultCommandValues, Runnable {
 
   // Metrics Option Group
   @CommandLine.ArgGroup(validate = false, heading = "@|bold Metrics Options|@%n")
-  MetricsOptionGroup metricsOptionGroup = new MetricsOptionGroup();
+  MetricsOptions metricsOptions = MetricsOptions.create();
 
   @Option(
       names = {"--host-allowlist"},
@@ -1153,7 +1152,6 @@ public class BesuCommand implements DefaultCommandValues, Runnable {
     final ImmutableMap<String, Object> unstableOptions =
         unstableOptionsBuild
             .put("Ethereum Wire Protocol", unstableEthProtocolOptions)
-            .put("Metrics", unstableMetricsCLIOptions)
             .put("P2P Network", unstableNetworkingOptions)
             .put("RPC", unstableRPCOptions)
             .put("DNS Configuration", unstableDnsOptions)
@@ -1606,11 +1604,14 @@ public class BesuCommand implements DefaultCommandValues, Runnable {
   }
 
   private GenesisConfigFile readGenesisConfigFile() {
-    final GenesisConfigFile effectiveGenesisFile =
-        genesisFile != null
-            ? GenesisConfigFile.fromSource(genesisConfigSource(genesisFile))
-            : GenesisConfigFile.fromResource(
-                Optional.ofNullable(network).orElse(MAINNET).getGenesisFile());
+    GenesisConfigFile effectiveGenesisFile;
+    effectiveGenesisFile =
+        network.equals(EPHEMERY)
+            ? EphemeryGenesisUpdater.updateGenesis(genesisConfigOverrides)
+            : genesisFile != null
+                ? GenesisConfigFile.fromSource(genesisConfigSource(genesisFile))
+                : GenesisConfigFile.fromResource(
+                    Optional.ofNullable(network).orElse(MAINNET).getGenesisFile());
     return effectiveGenesisFile.withOverrides(genesisConfigOverrides);
   }
 
@@ -1864,7 +1865,7 @@ public class BesuCommand implements DefaultCommandValues, Runnable {
    * @return instance of MetricsConfiguration.
    */
   public MetricsConfiguration metricsConfiguration() {
-    if (metricsOptionGroup.getMetricsEnabled() && metricsOptionGroup.getMetricsPushEnabled()) {
+    if (metricsOptions.getMetricsEnabled() && metricsOptions.getMetricsPushEnabled()) {
       throw new ParameterException(
           this.commandLine,
           "--metrics-enabled option and --metrics-push-enabled option can't be used at the same "
@@ -1875,40 +1876,33 @@ public class BesuCommand implements DefaultCommandValues, Runnable {
         logger,
         commandLine,
         "--metrics-enabled",
-        !metricsOptionGroup.getMetricsEnabled(),
+        !metricsOptions.getMetricsEnabled(),
         asList("--metrics-host", "--metrics-port"));
 
     CommandLineUtils.checkOptionDependencies(
         logger,
         commandLine,
         "--metrics-push-enabled",
-        !metricsOptionGroup.getMetricsPushEnabled(),
+        !metricsOptions.getMetricsPushEnabled(),
         asList(
             "--metrics-push-host",
             "--metrics-push-port",
             "--metrics-push-interval",
             "--metrics-push-prometheus-job"));
 
-    return unstableMetricsCLIOptions
-        .toDomainObject()
-        .enabled(metricsOptionGroup.getMetricsEnabled())
+    final MetricsConfiguration.Builder metricsConfigurationBuilder =
+        metricsOptions.toDomainObject();
+    metricsConfigurationBuilder
         .host(
-            Strings.isNullOrEmpty(metricsOptionGroup.getMetricsHost())
+            Strings.isNullOrEmpty(metricsOptions.getMetricsHost())
                 ? p2PDiscoveryOptions.p2pHost
-                : metricsOptionGroup.getMetricsHost())
-        .port(metricsOptionGroup.getMetricsPort())
-        .protocol(metricsOptionGroup.getMetricsProtocol())
-        .metricCategories(metricsOptionGroup.getMetricCategories())
-        .pushEnabled(metricsOptionGroup.getMetricsPushEnabled())
+                : metricsOptions.getMetricsHost())
         .pushHost(
-            Strings.isNullOrEmpty(metricsOptionGroup.getMetricsPushHost())
+            Strings.isNullOrEmpty(metricsOptions.getMetricsPushHost())
                 ? p2PDiscoveryOptions.autoDiscoverDefaultIP().getHostAddress()
-                : metricsOptionGroup.getMetricsPushHost())
-        .pushPort(metricsOptionGroup.getMetricsPushPort())
-        .pushInterval(metricsOptionGroup.getMetricsPushInterval())
-        .hostsAllowlist(hostsAllowlist)
-        .prometheusJob(metricsOptionGroup.getMetricsPrometheusJob())
-        .build();
+                : metricsOptions.getMetricsPushHost())
+        .hostsAllowlist(hostsAllowlist);
+    return metricsConfigurationBuilder.build();
   }
 
   private PrivacyParameters privacyParameters() {
@@ -2281,7 +2275,7 @@ public class BesuCommand implements DefaultCommandValues, Runnable {
     return new VertxOptions()
         .setPreferNativeTransport(true)
         .setMetricsOptions(
-            new MetricsOptions()
+            new io.vertx.core.metrics.MetricsOptions()
                 .setEnabled(true)
                 .setFactory(new VertxMetricsAdapterFactory(metricsSystem)));
   }
@@ -2344,7 +2338,11 @@ public class BesuCommand implements DefaultCommandValues, Runnable {
     if (networkId != null) {
       builder.setNetworkId(networkId);
     }
-
+    // ChainId update is required for Ephemery network
+    if (network.equals(EPHEMERY)) {
+      String chainId = genesisConfigOverrides.get("chainId");
+      builder.setNetworkId(new BigInteger(chainId));
+    }
     if (p2PDiscoveryOptions.discoveryDnsUrl != null) {
       builder.setDnsDiscoveryUrl(p2PDiscoveryOptions.discoveryDnsUrl);
     } else {
@@ -2537,9 +2535,7 @@ public class BesuCommand implements DefaultCommandValues, Runnable {
         effectivePorts, rpcWebsocketOptions.getRpcWsPort(), rpcWebsocketOptions.isRpcWsEnabled());
     addPortIfEnabled(effectivePorts, engineRPCConfig.engineRpcPort(), isEngineApiEnabled());
     addPortIfEnabled(
-        effectivePorts,
-        metricsOptionGroup.getMetricsPort(),
-        metricsOptionGroup.getMetricsEnabled());
+        effectivePorts, metricsOptions.getMetricsPort(), metricsOptions.getMetricsEnabled());
     addPortIfEnabled(
         effectivePorts,
         miningParametersSupplier.get().getStratumPort(),
@@ -2613,7 +2609,7 @@ public class BesuCommand implements DefaultCommandValues, Runnable {
   }
 
   private void setMergeConfigOptions() {
-    MergeConfigOptions.setMergeEnabled(
+    MergeConfiguration.setMergeEnabled(
         genesisConfigOptionsSupplier.get().getTerminalTotalDifficulty().isPresent());
   }
 
@@ -2658,7 +2654,7 @@ public class BesuCommand implements DefaultCommandValues, Runnable {
   }
 
   private boolean isMergeEnabled() {
-    return MergeConfigOptions.isMergeEnabled();
+    return MergeConfiguration.isMergeEnabled();
   }
 
   private boolean isEngineApiEnabled() {
@@ -2752,11 +2748,20 @@ public class BesuCommand implements DefaultCommandValues, Runnable {
   }
 
   /**
-   * Returns the plugin context.
+   * 2 Returns the plugin context.
    *
    * @return the plugin context.
    */
   public BesuPluginContextImpl getBesuPluginContext() {
     return besuPluginContext;
   }
+
+  /**
+   * Returns the metrics options
+   *
+   * @return the metrics options
+   */
+  public MetricsOptions getMetricsOptions() {
+    return metricsOptions;
+  }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/config/EthNetworkConfig.java b/besu/src/main/java/org/hyperledger/besu/cli/config/EthNetworkConfig.java
index dd5e43e63f..dab3a4c227 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/config/EthNetworkConfig.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/config/EthNetworkConfig.java
@@ -77,6 +77,7 @@ public record EthNetworkConfig(
                 strings ->
                     strings.stream().map(EnodeURLImpl::fromString).collect(Collectors.toList()))
             .orElse(Collections.emptyList());
+
     return new EthNetworkConfig(
         genesisConfigFile,
         networkName.getNetworkId(),
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java b/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java
index f864068bb4..9cb5296d32 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java
@@ -31,6 +31,12 @@ public enum NetworkName {
   /** LUKSO mainnet network name. */
   LUKSO("/lukso.json", BigInteger.valueOf(42)),
 
+  /**
+   * EPHEMERY network name. The actual networkId used is calculated based on this default value and
+   * the current time. https://ephemery.dev/
+   */
+  EPHEMERY("/ephemery.json", BigInteger.valueOf(39438135)),
+
   /** Dev network name. */
   DEV("/dev.json", BigInteger.valueOf(2018), false),
   /** Future EIPs network name. */
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/stable/JsonRpcHttpOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/stable/JsonRpcHttpOptions.java
index 1c7e0f543e..7d08a6f9aa 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/options/stable/JsonRpcHttpOptions.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/stable/JsonRpcHttpOptions.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.cli.options.stable;
 
 import static java.util.Arrays.asList;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration.DEFAULT_JSON_RPC_HOST;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration.DEFAULT_JSON_RPC_PORT;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration.DEFAULT_PRETTY_JSON_ENABLED;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.DEFAULT_RPC_APIS;
@@ -65,7 +66,7 @@ public class JsonRpcHttpOptions {
       paramLabel = DefaultCommandValues.MANDATORY_HOST_FORMAT_HELP,
       description = "Host for JSON-RPC HTTP to listen on (default: ${DEFAULT-VALUE})",
       arity = "1")
-  private String rpcHttpHost;
+  private String rpcHttpHost = DEFAULT_JSON_RPC_HOST;
 
   @CommandLine.Option(
       names = {"--rpc-http-port"},
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/stable/MetricsOptionGroup.java b/besu/src/main/java/org/hyperledger/besu/cli/options/stable/MetricsOptions.java
similarity index 57%
rename from besu/src/main/java/org/hyperledger/besu/cli/options/stable/MetricsOptionGroup.java
rename to besu/src/main/java/org/hyperledger/besu/cli/options/stable/MetricsOptions.java
index 1c17e1cf9d..4906cf538e 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/options/stable/MetricsOptionGroup.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/stable/MetricsOptions.java
@@ -22,20 +22,80 @@ import static org.hyperledger.besu.metrics.MetricsProtocol.PROMETHEUS;
 import static org.hyperledger.besu.metrics.prometheus.MetricsConfiguration.DEFAULT_METRICS_PORT;
 import static org.hyperledger.besu.metrics.prometheus.MetricsConfiguration.DEFAULT_METRICS_PUSH_PORT;
 
+import org.hyperledger.besu.cli.options.CLIOptions;
+import org.hyperledger.besu.cli.util.CommandLineUtils;
 import org.hyperledger.besu.metrics.MetricsProtocol;
+import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 import org.hyperledger.besu.plugin.services.metrics.MetricCategory;
 
+import java.util.List;
 import java.util.Set;
 
 import picocli.CommandLine;
 
 /** Command line options for configuring metrics. */
-// TODO: implement CLIOption<MetricsConfiguration> and rename to drop the Group
-public class MetricsOptionGroup {
+// TODO: implement CLIOption<MetricsConfiguration>
+public class MetricsOptions implements CLIOptions<MetricsConfiguration.Builder> {
+
+  /**
+   * Returns a MetricsConfiguration.Builder because fields are often overridden from other domains,
+   * like using P2P settings as defaults.
+   *
+   * @return a newly created {@link MetricsOptions} with default values
+   */
+  @Override
+  public MetricsConfiguration.Builder toDomainObject() {
+    MetricsConfiguration.Builder builder = MetricsConfiguration.builder();
+    builder
+        .timersEnabled(unstableOptions.timersEnabled)
+        .idleTimeout(unstableOptions.idleTimeout)
+        .enabled(getMetricsEnabled())
+        .host(getMetricsHost())
+        .port(getMetricsPort())
+        .protocol(getMetricsProtocol())
+        .metricCategories(getMetricCategories())
+        .pushEnabled(getMetricsPushEnabled())
+        .pushHost(getMetricsPushHost())
+        .pushPort(getMetricsPushPort())
+        .pushInterval(getMetricsPushInterval())
+        .prometheusJob(getMetricsPrometheusJob());
+    return builder;
+  }
+
+  // TODO: why do we need to be able to reverse this?
+  /**
+   * Returns a newly created {@link MetricsOptions} reversed from the supplied MetricsConfiguration
+   *
+   * @param config the metrics configuration
+   * @return a newly created {@link MetricsOptions} reversed from the supplied MetricsConfiguration
+   */
+  public static MetricsOptions fromConfiguration(final MetricsConfiguration config) {
+    final MetricsOptions metricsOptions = create();
+    metricsOptions.unstableOptions.timersEnabled = config.isTimersEnabled();
+    metricsOptions.unstableOptions.idleTimeout = config.getIdleTimeout();
+    metricsOptions.isMetricsEnabled = config.isEnabled();
+    metricsOptions.metricsHost = config.getHost();
+    metricsOptions.metricsPort = config.getPort();
+    metricsOptions.metricsProtocol = config.getProtocol();
+    metricsOptions.metricCategories = config.getMetricCategories();
+    metricsOptions.metricsPrometheusJob = config.getPrometheusJob();
+    metricsOptions.isMetricsPushEnabled = config.isPushEnabled();
+    metricsOptions.metricsPushHost = config.getPushHost();
+    metricsOptions.metricsPushPort = config.getPushPort();
+    metricsOptions.metricsPushInterval = config.getPushInterval();
+
+    return metricsOptions;
+  }
+
+  @Override
+  public List<String> getCLIOptions() {
+    return CommandLineUtils.getCLIOptions(this, new MetricsOptions());
+  }
+
   @CommandLine.Option(
       names = {"--metrics-enabled"},
       description = "Set to start the metrics exporter (default: ${DEFAULT-VALUE})")
-  private final Boolean isMetricsEnabled = false;
+  private Boolean isMetricsEnabled = false;
 
   @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
   @CommandLine.Option(
@@ -50,14 +110,14 @@ public class MetricsOptionGroup {
       paramLabel = MANDATORY_HOST_FORMAT_HELP,
       description = "Host for the metrics exporter to listen on (default: ${DEFAULT-VALUE})",
       arity = "1")
-  private String metricsHost;
+  private String metricsHost = MetricsConfiguration.DEFAULT_METRICS_HOST;
 
   @CommandLine.Option(
       names = {"--metrics-port"},
       paramLabel = MANDATORY_PORT_FORMAT_HELP,
       description = "Port for the metrics exporter to listen on (default: ${DEFAULT-VALUE})",
       arity = "1")
-  private final Integer metricsPort = DEFAULT_METRICS_PORT;
+  private Integer metricsPort = DEFAULT_METRICS_PORT;
 
   @CommandLine.Option(
       names = {"--metrics-category", "--metrics-categories"},
@@ -66,12 +126,12 @@ public class MetricsOptionGroup {
       arity = "1..*",
       description =
           "Comma separated list of categories to track metrics for (default: ${DEFAULT-VALUE})")
-  private final Set<MetricCategory> metricCategories = DEFAULT_METRIC_CATEGORIES;
+  private Set<MetricCategory> metricCategories = DEFAULT_METRIC_CATEGORIES;
 
   @CommandLine.Option(
       names = {"--metrics-push-enabled"},
       description = "Enable the metrics push gateway integration (default: ${DEFAULT-VALUE})")
-  private final Boolean isMetricsPushEnabled = false;
+  private Boolean isMetricsPushEnabled = false;
 
   @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
   @CommandLine.Option(
@@ -79,14 +139,14 @@ public class MetricsOptionGroup {
       paramLabel = MANDATORY_HOST_FORMAT_HELP,
       description = "Host of the Prometheus Push Gateway for push mode (default: ${DEFAULT-VALUE})",
       arity = "1")
-  private String metricsPushHost;
+  private String metricsPushHost = MetricsConfiguration.DEFAULT_METRICS_PUSH_HOST;
 
   @CommandLine.Option(
       names = {"--metrics-push-port"},
       paramLabel = MANDATORY_PORT_FORMAT_HELP,
       description = "Port of the Prometheus Push Gateway for push mode (default: ${DEFAULT-VALUE})",
       arity = "1")
-  private final Integer metricsPushPort = DEFAULT_METRICS_PUSH_PORT;
+  private Integer metricsPushPort = DEFAULT_METRICS_PUSH_PORT;
 
   @CommandLine.Option(
       names = {"--metrics-push-interval"},
@@ -94,7 +154,7 @@ public class MetricsOptionGroup {
       description =
           "Interval in seconds to push metrics when in push mode (default: ${DEFAULT-VALUE})",
       arity = "1")
-  private final Integer metricsPushInterval = 15;
+  private Integer metricsPushInterval = 15;
 
   @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
   @CommandLine.Option(
@@ -103,8 +163,16 @@ public class MetricsOptionGroup {
       arity = "1")
   private String metricsPrometheusJob = "besu-client";
 
-  /** Returns a newly created {@link MetricsOptionGroup} with default values. */
-  public MetricsOptionGroup() {}
+  /**
+   * Returns a newly created {@link MetricsOptions} with default values.
+   *
+   * @return new instance
+   */
+  public static MetricsOptions create() {
+    return new MetricsOptions();
+  }
+
+  private MetricsOptions() {}
 
   /**
    * Returns whether metrics are enabled.
@@ -195,4 +263,26 @@ public class MetricsOptionGroup {
   public String getMetricsPrometheusJob() {
     return metricsPrometheusJob;
   }
+
+  @CommandLine.ArgGroup(validate = false)
+  private final MetricsOptions.Unstable unstableOptions = new MetricsOptions.Unstable();
+
+  static class Unstable {
+    private static final String TIMERS_ENABLED_FLAG = "--Xmetrics-timers-enabled";
+    private static final String IDLE_TIMEOUT_FLAG = "--Xmetrics-idle-timeout";
+
+    @CommandLine.Option(
+        names = TIMERS_ENABLED_FLAG,
+        hidden = true,
+        description = "Whether to enable timer metrics (default: ${DEFAULT-VALUE}).")
+    private Boolean timersEnabled = MetricsConfiguration.DEFAULT_METRICS_TIMERS_ENABLED;
+
+    @CommandLine.Option(
+        hidden = true,
+        names = {IDLE_TIMEOUT_FLAG},
+        paramLabel = "<INTEGER>",
+        description = "Timeout for metrics TCP connections, in seconds (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private int idleTimeout = MetricsConfiguration.DEFAULT_METRICS_IDLE_TIMEOUT_SECONDS;
+  }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/stable/P2PDiscoveryOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/stable/P2PDiscoveryOptions.java
index 21c24b3e27..a15be99dc7 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/options/stable/P2PDiscoveryOptions.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/stable/P2PDiscoveryOptions.java
@@ -52,20 +52,7 @@ public class P2PDiscoveryOptions implements CLIOptions<P2PDiscoveryConfiguration
       arity = "1")
   public final Boolean p2pEnabled = true;
 
-  /**
-   * Boolean option to indicate if peers should NOT be discovered, default to false indicates that
-   * the peers should be discovered by default.
-   */
-  //
-  // This negative option is required because of the nature of the option that is
-  // true when
-  // added on the command line. You can't do --option=false, so false is set as
-  // default
-  // and you have not to set the option at all if you want it false.
-  // This seems to be the only way it works with Picocli.
-  // Also many other software use the same negative option scheme for false
-  // defaults
-  // meaning that it's probably the right way to handle disabling options.
+  /** Boolean option to indicate if peers should be discovered. */
   @CommandLine.Option(
       names = {"--discovery-enabled"},
       description = "Enable P2P discovery (default: ${DEFAULT-VALUE})",
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/MetricsCLIOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/MetricsCLIOptions.java
deleted file mode 100644
index 4149d9869e..0000000000
--- a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/MetricsCLIOptions.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.cli.options.unstable;
-
-import org.hyperledger.besu.cli.options.CLIOptions;
-import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
-
-import java.util.Arrays;
-import java.util.List;
-
-import picocli.CommandLine;
-
-/** The Metrics cli options. */
-// TODO: combine into MetricsOptionGroup, use Unstable inner class pattern (see MiningOptions)
-public class MetricsCLIOptions implements CLIOptions<MetricsConfiguration.Builder> {
-  private static final String TIMERS_ENABLED_FLAG = "--Xmetrics-timers-enabled";
-  private static final String IDLE_TIMEOUT_FLAG = "--Xmetrics-idle-timeout";
-
-  @CommandLine.Option(
-      names = TIMERS_ENABLED_FLAG,
-      hidden = true,
-      description = "Whether to enable timer metrics (default: ${DEFAULT-VALUE}).")
-  private Boolean timersEnabled = MetricsConfiguration.DEFAULT_METRICS_TIMERS_ENABLED;
-
-  @CommandLine.Option(
-      hidden = true,
-      names = {IDLE_TIMEOUT_FLAG},
-      paramLabel = "<INTEGER>",
-      description = "Timeout for metrics TCP connections, in seconds (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private int idleTimeout = MetricsConfiguration.DEFAULT_METRICS_IDLE_TIMEOUT_SECONDS;
-
-  private MetricsCLIOptions() {}
-
-  /**
-   * Create metrics cli options.
-   *
-   * @return the metrics cli options
-   */
-  public static MetricsCLIOptions create() {
-    return new MetricsCLIOptions();
-  }
-
-  /**
-   * From configuration metrics cli options.
-   *
-   * @param config the config
-   * @return the metrics cli options
-   */
-  public static MetricsCLIOptions fromConfiguration(final MetricsConfiguration config) {
-    final MetricsCLIOptions metricsOptions = create();
-    metricsOptions.timersEnabled = config.isTimersEnabled();
-    metricsOptions.idleTimeout = config.getIdleTimeout();
-    return metricsOptions;
-  }
-
-  @Override
-  public MetricsConfiguration.Builder toDomainObject() {
-    return MetricsConfiguration.builder().timersEnabled(timersEnabled).idleTimeout(idleTimeout);
-  }
-
-  @Override
-  public List<String> getCLIOptions() {
-    return Arrays.asList(
-        TIMERS_ENABLED_FLAG + "=" + timersEnabled.toString(),
-        IDLE_TIMEOUT_FLAG + "=" + idleTimeout);
-  }
-}
diff --git a/besu/src/main/java/org/hyperledger/besu/util/EphemeryGenesisUpdater.java b/besu/src/main/java/org/hyperledger/besu/util/EphemeryGenesisUpdater.java
new file mode 100644
index 0000000000..0b970a6809
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/util/EphemeryGenesisUpdater.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.util;
+
+import static org.hyperledger.besu.cli.config.NetworkName.EPHEMERY;
+
+import org.hyperledger.besu.config.GenesisConfigFile;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * The Generate Ephemery Genesis Updater. Checks for update based on the set period and update the
+ * Ephemery genesis in memory
+ */
+public class EphemeryGenesisUpdater {
+  private static final int PERIOD_IN_DAYS = 28;
+  private static final long PERIOD_IN_SECONDS = (PERIOD_IN_DAYS * 24 * 60 * 60);
+
+  /**
+   * Constructor for EphemeryGenesisUpdater. Initializes the genesis updater for the Ephemery
+   * network.
+   */
+  public EphemeryGenesisUpdater() {}
+
+  /**
+   * Updates the Ephemery genesis configuration based on the predefined period.
+   *
+   * @param overrides a map of configuration overrides
+   * @return the updated GenesisConfigFile
+   * @throws RuntimeException if an error occurs during the update process
+   */
+  public static GenesisConfigFile updateGenesis(final Map<String, String> overrides)
+      throws RuntimeException {
+    GenesisConfigFile genesisConfigFile;
+    try {
+      if (EPHEMERY.getGenesisFile() == null) {
+        throw new IOException("Genesis file or config options are null");
+      }
+      genesisConfigFile = GenesisConfigFile.fromResource(EPHEMERY.getGenesisFile());
+      long genesisTimestamp = genesisConfigFile.getTimestamp();
+      Optional<BigInteger> genesisChainId = genesisConfigFile.getConfigOptions().getChainId();
+      long currentTimestamp = Instant.now().getEpochSecond();
+      long periodsSinceGenesis =
+          ChronoUnit.DAYS.between(Instant.ofEpochSecond(genesisTimestamp), Instant.now())
+              / PERIOD_IN_DAYS;
+
+      long updatedTimestamp = genesisTimestamp + (periodsSinceGenesis * PERIOD_IN_SECONDS);
+      BigInteger updatedChainId =
+          genesisChainId
+              .orElseThrow(() -> new IllegalStateException("ChainId not present"))
+              .add(BigInteger.valueOf(periodsSinceGenesis));
+      // has a period elapsed since original ephemery genesis time? if so, override chainId and
+      // timestamp
+      if (currentTimestamp > (genesisTimestamp + PERIOD_IN_SECONDS)) {
+        overrides.put("chainId", String.valueOf(updatedChainId));
+        overrides.put("timestamp", String.valueOf(updatedTimestamp));
+        genesisConfigFile = genesisConfigFile.withOverrides(overrides);
+      }
+      return genesisConfigFile.withOverrides(overrides);
+    } catch (IOException e) {
+      throw new RuntimeException("Error updating ephemery genesis: " + e.getMessage(), e);
+    }
+  }
+}
diff --git a/besu/src/test/java/org/hyperledger/besu/RunnerBuilderTest.java b/besu/src/test/java/org/hyperledger/besu/RunnerBuilderTest.java
index c7180b958c..7c5579d471 100644
--- a/besu/src/test/java/org/hyperledger/besu/RunnerBuilderTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/RunnerBuilderTest.java
@@ -24,7 +24,7 @@ import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.cli.config.EthNetworkConfig;
 import org.hyperledger.besu.config.GenesisConfigOptions;
-import org.hyperledger.besu.config.MergeConfigOptions;
+import org.hyperledger.besu.config.MergeConfiguration;
 import org.hyperledger.besu.consensus.common.bft.BftEventQueue;
 import org.hyperledger.besu.consensus.common.bft.network.PeerConnectionTracker;
 import org.hyperledger.besu.consensus.common.bft.protocol.BftProtocolManager;
@@ -250,7 +250,7 @@ public final class RunnerBuilderTest {
     engine.setEnabled(true);
     final EthNetworkConfig mockMainnet = mock(EthNetworkConfig.class);
     when(mockMainnet.networkId()).thenReturn(BigInteger.ONE);
-    MergeConfigOptions.setMergeEnabled(true);
+    MergeConfiguration.setMergeEnabled(true);
     when(besuController.getMiningCoordinator()).thenReturn(mock(MergeMiningCoordinator.class));
 
     final Runner runner =
@@ -292,7 +292,7 @@ public final class RunnerBuilderTest {
     wsRpc.setEnabled(true);
     final EthNetworkConfig mockMainnet = mock(EthNetworkConfig.class);
     when(mockMainnet.networkId()).thenReturn(BigInteger.ONE);
-    MergeConfigOptions.setMergeEnabled(true);
+    MergeConfiguration.setMergeEnabled(true);
     when(besuController.getMiningCoordinator()).thenReturn(mock(MergeMiningCoordinator.class));
     final JsonRpcConfiguration engineConf = JsonRpcConfiguration.createEngineDefault();
     engineConf.setEnabled(true);
@@ -335,7 +335,7 @@ public final class RunnerBuilderTest {
     wsRpc.setEnabled(true);
     final EthNetworkConfig mockMainnet = mock(EthNetworkConfig.class);
     when(mockMainnet.networkId()).thenReturn(BigInteger.ONE);
-    MergeConfigOptions.setMergeEnabled(true);
+    MergeConfiguration.setMergeEnabled(true);
     when(besuController.getMiningCoordinator()).thenReturn(mock(MergeMiningCoordinator.class));
     final JsonRpcConfiguration engineConf = JsonRpcConfiguration.createEngineDefault();
     engineConf.setEnabled(true);
@@ -383,7 +383,7 @@ public final class RunnerBuilderTest {
     defaultWebSockConfig.setEnabled(true);
     final EthNetworkConfig mockMainnet = mock(EthNetworkConfig.class);
     when(mockMainnet.networkId()).thenReturn(BigInteger.ONE);
-    MergeConfigOptions.setMergeEnabled(true);
+    MergeConfiguration.setMergeEnabled(true);
 
     final Runner runner =
         new RunnerBuilder()
diff --git a/besu/src/test/java/org/hyperledger/besu/RunnerTest.java b/besu/src/test/java/org/hyperledger/besu/RunnerTest.java
index 5fbd75f0b3..4efe3d21d1 100644
--- a/besu/src/test/java/org/hyperledger/besu/RunnerTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/RunnerTest.java
@@ -28,7 +28,7 @@ import org.hyperledger.besu.cli.config.EthNetworkConfig;
 import org.hyperledger.besu.components.BesuComponent;
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.config.JsonUtil;
-import org.hyperledger.besu.config.MergeConfigOptions;
+import org.hyperledger.besu.config.MergeConfiguration;
 import org.hyperledger.besu.controller.BesuController;
 import org.hyperledger.besu.controller.MainnetBesuControllerBuilder;
 import org.hyperledger.besu.crypto.KeyPairUtil;
@@ -151,7 +151,7 @@ public final class RunnerTest {
   @Test
   public void fullSyncFromGenesis() throws Exception {
     // set merge flag to false, otherwise this test can fail if a merge test runs first
-    MergeConfigOptions.setMergeEnabled(false);
+    MergeConfiguration.setMergeEnabled(false);
 
     syncFromGenesis(SyncMode.FULL, getFastSyncGenesis(), false);
   }
@@ -167,7 +167,7 @@ public final class RunnerTest {
   @Test
   public void fastSyncFromGenesis() throws Exception {
     // set merge flag to false, otherwise this test can fail if a merge test runs first
-    MergeConfigOptions.setMergeEnabled(false);
+    MergeConfiguration.setMergeEnabled(false);
 
     syncFromGenesis(SyncMode.FAST, getFastSyncGenesis(), false);
   }
diff --git a/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java b/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java
index 7d4fabb222..2d9e587c3f 100644
--- a/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java
@@ -21,7 +21,7 @@ import static org.mockito.Mockito.mock;
 import org.hyperledger.besu.cli.config.EthNetworkConfig;
 import org.hyperledger.besu.cli.config.NetworkName;
 import org.hyperledger.besu.components.BesuComponent;
-import org.hyperledger.besu.config.MergeConfigOptions;
+import org.hyperledger.besu.config.MergeConfiguration;
 import org.hyperledger.besu.controller.BesuController;
 import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
 import org.hyperledger.besu.ethereum.GasLimitCalculator;
@@ -91,7 +91,7 @@ public final class RlpBlockImporterTest {
   @Test
   public void blockImportRejectsBadPow() throws IOException {
     // set merge flag to false, otherwise this test can fail if a merge test runs first
-    MergeConfigOptions.setMergeEnabled(false);
+    MergeConfiguration.setMergeEnabled(false);
 
     final Path source = dataDir.resolve("badpow.blocks");
     BlockTestUtil.writeBadPowBlocks(source);
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
index 99b45ada1b..de209f65e4 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
@@ -19,6 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hyperledger.besu.cli.config.NetworkName.CLASSIC;
 import static org.hyperledger.besu.cli.config.NetworkName.DEV;
+import static org.hyperledger.besu.cli.config.NetworkName.EPHEMERY;
 import static org.hyperledger.besu.cli.config.NetworkName.EXPERIMENTAL_EIPS;
 import static org.hyperledger.besu.cli.config.NetworkName.FUTURE_EIPS;
 import static org.hyperledger.besu.cli.config.NetworkName.HOLESKY;
@@ -43,8 +44,9 @@ import static org.mockito.Mockito.verify;
 
 import org.hyperledger.besu.BesuInfo;
 import org.hyperledger.besu.cli.config.EthNetworkConfig;
+import org.hyperledger.besu.cli.config.NetworkName;
 import org.hyperledger.besu.config.GenesisConfigFile;
-import org.hyperledger.besu.config.MergeConfigOptions;
+import org.hyperledger.besu.config.MergeConfiguration;
 import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.Wei;
@@ -162,13 +164,13 @@ public class BesuCommandTest extends CommandTestAbstract {
       // and ignore errors in case no trusted setup was already loaded
     }
 
-    MergeConfigOptions.setMergeEnabled(false);
+    MergeConfiguration.setMergeEnabled(false);
   }
 
   @AfterEach
   public void tearDown() {
 
-    MergeConfigOptions.setMergeEnabled(false);
+    MergeConfiguration.setMergeEnabled(false);
   }
 
   @Test
@@ -1027,6 +1029,12 @@ public class BesuCommandTest extends CommandTestAbstract {
 
     assertThat(commandOutput.toString(UTF_8)).isEmpty();
     assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+
+    // rpc host should remain default ie 127.0.0.1
+    verify(mockRunnerBuilder).jsonRpcConfiguration(jsonRpcConfigArgumentCaptor.capture());
+    verify(mockRunnerBuilder).build();
+
+    assertThat(jsonRpcConfigArgumentCaptor.getValue().getHost()).isEqualTo("127.0.0.1");
   }
 
   @Test
@@ -1863,6 +1871,20 @@ public class BesuCommandTest extends CommandTestAbstract {
     assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
+  @Test
+  public void ephemeryValuesAreUsed() {
+    parseCommand("--network", "ephemery");
+
+    final ArgumentCaptor<EthNetworkConfig> networkArg =
+        ArgumentCaptor.forClass(EthNetworkConfig.class);
+
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any());
+    verify(mockControllerBuilder).build();
+    assertThat(NetworkName.valueOf(String.valueOf(EPHEMERY))).isEqualTo(EPHEMERY);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
   @Test
   public void classicValuesAreUsed() {
     parseCommand("--network", "classic");
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java b/besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java
index 7657dcd26a..00603bec87 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java
@@ -39,7 +39,6 @@ import org.hyperledger.besu.cli.options.MiningOptions;
 import org.hyperledger.besu.cli.options.TransactionPoolOptions;
 import org.hyperledger.besu.cli.options.stable.EthstatsOptions;
 import org.hyperledger.besu.cli.options.unstable.EthProtocolOptions;
-import org.hyperledger.besu.cli.options.unstable.MetricsCLIOptions;
 import org.hyperledger.besu.cli.options.unstable.NetworkingOptions;
 import org.hyperledger.besu.cli.options.unstable.SynchronizerOptions;
 import org.hyperledger.besu.components.BesuComponent;
@@ -610,10 +609,6 @@ public abstract class CommandTestAbstract {
       return dataStorageOptions;
     }
 
-    public MetricsCLIOptions getMetricsCLIOptions() {
-      return unstableMetricsCLIOptions;
-    }
-
     public void close() {
       if (vertx != null) {
         final AtomicBoolean closed = new AtomicBoolean(false);
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/NetworkDeprecationMessageTest.java b/besu/src/test/java/org/hyperledger/besu/cli/NetworkDeprecationMessageTest.java
index 87be2a699e..649560d111 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/NetworkDeprecationMessageTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/NetworkDeprecationMessageTest.java
@@ -39,9 +39,7 @@ class NetworkDeprecationMessageTest {
   @ParameterizedTest
   @EnumSource(
       value = NetworkName.class,
-      names = {
-        "MAINNET", "SEPOLIA", "DEV", "CLASSIC", "MORDOR", "HOLESKY", "LUKSO",
-      })
+      names = {"MAINNET", "SEPOLIA", "DEV", "CLASSIC", "MORDOR", "HOLESKY", "LUKSO", "EPHEMERY"})
   void shouldThrowErrorForNonDeprecatedNetworks(final NetworkName network) {
     assertThatThrownBy(() -> NetworkDeprecationMessage.generate(network))
         .isInstanceOf(AssertionError.class);
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/options/MetricsCLIOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/MetricsOptionsTest.java
similarity index 78%
rename from besu/src/test/java/org/hyperledger/besu/cli/options/MetricsCLIOptionsTest.java
rename to besu/src/test/java/org/hyperledger/besu/cli/options/MetricsOptionsTest.java
index e88462216f..992dcc437d 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/options/MetricsCLIOptionsTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/options/MetricsOptionsTest.java
@@ -14,15 +14,15 @@
  */
 package org.hyperledger.besu.cli.options;
 
-import org.hyperledger.besu.cli.options.unstable.MetricsCLIOptions;
+import org.hyperledger.besu.cli.options.stable.MetricsOptions;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-public class MetricsCLIOptionsTest
-    extends AbstractCLIOptionsTest<MetricsConfiguration.Builder, MetricsCLIOptions> {
+public class MetricsOptionsTest
+    extends AbstractCLIOptionsTest<MetricsConfiguration.Builder, MetricsOptions> {
 
   @Override
   protected MetricsConfiguration.Builder createDefaultDomainObject() {
@@ -37,13 +37,13 @@ public class MetricsCLIOptionsTest
   }
 
   @Override
-  protected MetricsCLIOptions optionsFromDomainObject(
+  protected MetricsOptions optionsFromDomainObject(
       final MetricsConfiguration.Builder domainObject) {
-    return MetricsCLIOptions.fromConfiguration(domainObject.build());
+    return MetricsOptions.fromConfiguration(domainObject.build());
   }
 
   @Override
-  protected MetricsCLIOptions getOptionsFromBesuCommand(final TestBesuCommand besuCommand) {
-    return besuCommand.getMetricsCLIOptions();
+  protected MetricsOptions getOptionsFromBesuCommand(final TestBesuCommand besuCommand) {
+    return besuCommand.getMetricsOptions();
   }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/util/EphemeryGenesisUpdaterTest.java b/besu/src/test/java/org/hyperledger/besu/util/EphemeryGenesisUpdaterTest.java
new file mode 100644
index 0000000000..fe21c1e6d7
--- /dev/null
+++ b/besu/src/test/java/org/hyperledger/besu/util/EphemeryGenesisUpdaterTest.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.util;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hyperledger.besu.config.GenesisConfigFile.fromConfig;
+
+import org.hyperledger.besu.config.GenesisConfigFile;
+
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.Optional;
+import java.util.TreeMap;
+
+import io.vertx.core.json.JsonObject;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class EphemeryGenesisUpdaterTest {
+  private static final int GENESIS_CONFIG_TEST_CHAINID = 39438135;
+  private static final long GENESIS_TEST_TIMESTAMP = 1720119600;
+  private static final long EARLIER_TIMESTAMP = 1712041200;
+  private static final long LATER_TIMESTAMP = 1922041200;
+  private static final long PERIOD_IN_SECONDS = 28 * 24 * 60 * 60;
+  private static final long PERIOD_SINCE_GENESIS = 3;
+
+  private static final JsonObject VALID_GENESIS_JSON =
+      (new JsonObject())
+          .put("config", (new JsonObject()).put("chainId", GENESIS_CONFIG_TEST_CHAINID))
+          .put("timestamp", GENESIS_TEST_TIMESTAMP);
+
+  private static final GenesisConfigFile INVALID_GENESIS_JSON = fromConfig("{}");
+  private static final JsonObject INVALID_GENESIS_JSON_WITHOUT_CHAINID =
+      (new JsonObject()).put("timestamp", GENESIS_TEST_TIMESTAMP);
+
+  private static final JsonObject INVALID_GENESIS_JSON_WITHOUT_TIMESTAMP =
+      new JsonObject()
+          .put("config", (new JsonObject()).put("chainId", GENESIS_CONFIG_TEST_CHAINID));
+
+  @Test
+  public void testEphemeryWhenChainIdIsAbsent() {
+    final GenesisConfigFile config =
+        GenesisConfigFile.fromConfig(INVALID_GENESIS_JSON_WITHOUT_CHAINID.toString());
+    Optional<BigInteger> chainId = config.getConfigOptions().getChainId();
+    assertThat(chainId).isNotPresent();
+  }
+
+  @Test
+  public void testShouldDefaultTimestampToZero() {
+    final GenesisConfigFile config =
+        GenesisConfigFile.fromConfig(INVALID_GENESIS_JSON_WITHOUT_TIMESTAMP.toString());
+    assertThat(config.getTimestamp()).isZero();
+  }
+
+  @Test
+  public void testEphemeryWhenGenesisJsonIsInvalid() {
+    assertThatThrownBy(INVALID_GENESIS_JSON::getDifficulty)
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Invalid genesis block configuration");
+  }
+
+  @Test
+  public void testEphemeryWhenGenesisJsonIsValid() {
+    final GenesisConfigFile config = GenesisConfigFile.fromConfig(VALID_GENESIS_JSON.toString());
+    assertThat(String.valueOf(config.getTimestamp()))
+        .isEqualTo(String.valueOf(GENESIS_TEST_TIMESTAMP));
+    assertThat(config.getConfigOptions().getChainId())
+        .hasValue(BigInteger.valueOf(GENESIS_CONFIG_TEST_CHAINID));
+    assertThat(String.valueOf(config.getTimestamp())).isNotNull();
+    assertThat(String.valueOf(config.getTimestamp())).isNotEmpty();
+  }
+
+  @Test
+  public void testEphemeryNotYetDueForUpdate() {
+    final GenesisConfigFile config = GenesisConfigFile.fromConfig(VALID_GENESIS_JSON.toString());
+    assertThat(EARLIER_TIMESTAMP).isLessThan(config.getTimestamp() + PERIOD_IN_SECONDS);
+  }
+
+  @Test
+  void testOverrideWithUpdatedChainIdAndTimeStamp() {
+    BigInteger expectedChainId =
+        BigInteger.valueOf(GENESIS_CONFIG_TEST_CHAINID)
+            .add(BigInteger.valueOf(PERIOD_SINCE_GENESIS));
+
+    long expectedGenesisTimestamp =
+        GENESIS_TEST_TIMESTAMP + (PERIOD_SINCE_GENESIS * PERIOD_IN_SECONDS);
+
+    final GenesisConfigFile config = GenesisConfigFile.fromResource("/ephemery.json");
+
+    final Map<String, String> override = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+    override.put("chainId", String.valueOf(expectedChainId));
+    override.put("timestamp", String.valueOf(expectedGenesisTimestamp));
+
+    assertThat(config.withOverrides(override).getConfigOptions().getChainId()).isPresent();
+    assertThat(config.withOverrides(override).getConfigOptions().getChainId())
+        .hasValue(expectedChainId);
+    assertThat(config.withOverrides(override).getTimestamp()).isNotNull();
+    assertThat(expectedChainId).isEqualTo(override.get("chainId"));
+    assertThat(String.valueOf(expectedGenesisTimestamp)).isEqualTo(override.get("timestamp"));
+  }
+
+  @Test
+  public void testEphemeryWhenSuccessful() {
+    final GenesisConfigFile config = GenesisConfigFile.fromConfig(VALID_GENESIS_JSON.toString());
+
+    BigInteger expectedChainId =
+        BigInteger.valueOf(GENESIS_CONFIG_TEST_CHAINID)
+            .add(BigInteger.valueOf(PERIOD_SINCE_GENESIS));
+
+    long expectedGenesisTimestamp =
+        GENESIS_TEST_TIMESTAMP + (PERIOD_SINCE_GENESIS * PERIOD_IN_SECONDS);
+    final Map<String, String> override = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+    override.put("chainId", String.valueOf(expectedChainId));
+    override.put("timestamp", String.valueOf(expectedGenesisTimestamp));
+    final GenesisConfigFile updatedConfig = config.withOverrides(override);
+
+    assertThat(LATER_TIMESTAMP)
+        .isGreaterThan(Long.parseLong(String.valueOf(GENESIS_TEST_TIMESTAMP + PERIOD_IN_SECONDS)));
+    assertThat(updatedConfig.getConfigOptions().getChainId()).hasValue(expectedChainId);
+    assertThat(updatedConfig.getTimestamp()).isEqualTo(expectedGenesisTimestamp);
+    assertThat(override.get("timestamp")).isEqualTo(String.valueOf(expectedGenesisTimestamp));
+    assertThat(override.get("chainId")).isEqualTo(expectedChainId.toString());
+  }
+}
diff --git a/config/src/main/java/org/hyperledger/besu/config/GenesisConfigFile.java b/config/src/main/java/org/hyperledger/besu/config/GenesisConfigFile.java
index 453c38dac2..8938e5143c 100644
--- a/config/src/main/java/org/hyperledger/besu/config/GenesisConfigFile.java
+++ b/config/src/main/java/org/hyperledger/besu/config/GenesisConfigFile.java
@@ -280,6 +280,9 @@ public class GenesisConfigFile {
    * @return the timestamp
    */
   public long getTimestamp() {
+    if (overrides != null && overrides.containsKey("timestamp")) {
+      return Long.parseLong(overrides.get("timestamp"));
+    }
     return parseLong("timestamp", JsonUtil.getValueAsString(genesisRoot, "timestamp", "0x0"));
   }
 
diff --git a/config/src/main/java/org/hyperledger/besu/config/MergeConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/MergeConfiguration.java
similarity index 85%
rename from config/src/main/java/org/hyperledger/besu/config/MergeConfigOptions.java
rename to config/src/main/java/org/hyperledger/besu/config/MergeConfiguration.java
index 6ba865e113..5ab6444209 100644
--- a/config/src/main/java/org/hyperledger/besu/config/MergeConfigOptions.java
+++ b/config/src/main/java/org/hyperledger/besu/config/MergeConfiguration.java
@@ -16,14 +16,14 @@ package org.hyperledger.besu.config;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-/** The Merge config options. */
-// TODO: naming this with Options as the suffix is misleading, it should be MergeConfig - doesn't
+/** The Merge configuration. */
+
 // use picocli
-public class MergeConfigOptions {
+public class MergeConfiguration {
   private static final AtomicBoolean mergeEnabled = new AtomicBoolean(false);
 
   /** Default constructor. */
-  private MergeConfigOptions() {}
+  private MergeConfiguration() {}
 
   /**
    * Enables merge.
diff --git a/config/src/main/resources/ephemery.json b/config/src/main/resources/ephemery.json
new file mode 100644
index 0000000000..5c73756fb5
--- /dev/null
+++ b/config/src/main/resources/ephemery.json
@@ -0,0 +1,916 @@
+{
+  "config": {
+    "chainId": 39438135,
+    "homesteadBlock": 0,
+    "eip150Block": 0,
+    "eip155Block": 0,
+    "eip158Block": 0,
+    "byzantiumBlock": 0,
+    "constantinopleBlock": 0,
+    "petersburgBlock": 0,
+    "istanbulBlock": 0,
+    "berlinBlock": 0,
+    "londonBlock": 0,
+    "mergeNetsplitBlock": 0,
+    "terminalTotalDifficulty": 0,
+    "terminalTotalDifficultyPassed": true,
+    "shanghaiTime": 0,
+    "cancunTime": 0,
+    "depositContractAddress": "0x4242424242424242424242424242424242424242",
+    "ethash" : {},
+    "discovery" : {
+      "bootnodes" : [
+        "enode://50a54ecbd2175497640bcf46a25bbe9bb4fae51d7cc2a29ef4947a7ee17496cf39a699b7fe6b703ed0feb9dbaae7e44fc3827fcb7435ca9ac6de4daa4d983b3d@137.74.203.240:30303",
+        "enode://0f2c301a9a3f9fa2ccfa362b79552c052905d8c2982f707f46cd29ece5a9e1c14ecd06f4ac951b228f059a43c6284a1a14fce709e8976cac93b50345218bf2e9@135.181.140.168:30343" ]
+    }
+  },
+  "alloc": {
+    "0x0000000000000000000000000000000000000000": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000001": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000002": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000003": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000004": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000005": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000006": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000007": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000008": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000009": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000000a": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000000b": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000000c": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000000d": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000000e": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000000f": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000010": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000011": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000012": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000013": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000014": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000015": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000016": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000017": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000018": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000019": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000001a": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000001b": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000001c": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000001d": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000001e": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000001f": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000020": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000021": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000022": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000023": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000024": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000025": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000026": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000027": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000028": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000029": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000002a": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000002b": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000002c": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000002d": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000002e": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000002f": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000030": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000031": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000032": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000033": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000034": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000035": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000036": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000037": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000038": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000039": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000003a": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000003b": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000003c": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000003d": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000003e": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000003f": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000040": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000041": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000042": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000043": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000044": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000045": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000046": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000047": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000048": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000049": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000004a": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000004b": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000004c": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000004d": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000004e": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000004f": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000050": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000051": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000052": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000053": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000054": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000055": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000056": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000057": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000058": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000059": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000005a": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000005b": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000005c": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000005d": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000005e": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000005f": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000060": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000061": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000062": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000063": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000064": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000065": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000066": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000067": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000068": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000069": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000006a": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000006b": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000006c": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000006d": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000006e": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000006f": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000070": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000071": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000072": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000073": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000074": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000075": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000076": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000077": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000078": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000079": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000007a": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000007b": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000007c": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000007d": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000007e": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000007f": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000080": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000081": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000082": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000083": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000084": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000085": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000086": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000087": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000088": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000089": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000008a": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000008b": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000008c": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000008d": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000008e": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000008f": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000090": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000091": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000092": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000093": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000094": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000095": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000096": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000097": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000098": {
+      "balance": "1"
+    },
+    "0x0000000000000000000000000000000000000099": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000009a": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000009b": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000009c": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000009d": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000009e": {
+      "balance": "1"
+    },
+    "0x000000000000000000000000000000000000009f": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000a0": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000a1": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000a2": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000a3": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000a4": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000a5": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000a6": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000a7": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000a8": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000a9": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000aa": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000ab": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000ac": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000ad": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000ae": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000af": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000b0": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000b1": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000b2": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000b3": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000b4": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000b5": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000b6": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000b7": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000b8": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000b9": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000ba": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000bb": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000bc": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000bd": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000be": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000bf": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000c0": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000c1": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000c2": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000c3": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000c4": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000c5": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000c6": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000c7": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000c8": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000c9": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000ca": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000cb": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000cc": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000cd": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000ce": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000cf": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000d0": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000d1": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000d2": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000d3": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000d4": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000d5": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000d6": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000d7": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000d8": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000d9": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000da": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000db": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000dc": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000dd": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000de": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000df": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000e0": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000e1": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000e2": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000e3": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000e4": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000e5": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000e6": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000e7": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000e8": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000e9": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000ea": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000eb": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000ec": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000ed": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000ee": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000ef": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000f0": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000f1": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000f2": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000f3": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000f4": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000f5": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000f6": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000f7": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000f8": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000f9": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000fa": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000fb": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000fc": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000fd": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000fe": {
+      "balance": "1"
+    },
+    "0x00000000000000000000000000000000000000ff": {
+      "balance": "1"
+    },
+    "0x4242424242424242424242424242424242424242": {
+      "balance": "0",
+      "code": "0x60806040526004361061003f5760003560e01c806301ffc9a71461004457806322895118146100a4578063621fd130146101ba578063c5f2892f14610244575b600080fd5b34801561005057600080fd5b506100906004803603602081101561006757600080fd5b50357fffffffff000000000000000000000000000000000000000000000000000000001661026b565b604080519115158252519081900360200190f35b6101b8600480360360808110156100ba57600080fd5b8101906020810181356401000000008111156100d557600080fd5b8201836020820111156100e757600080fd5b8035906020019184600183028401116401000000008311171561010957600080fd5b91939092909160208101903564010000000081111561012757600080fd5b82018360208201111561013957600080fd5b8035906020019184600183028401116401000000008311171561015b57600080fd5b91939092909160208101903564010000000081111561017957600080fd5b82018360208201111561018b57600080fd5b803590602001918460018302840111640100000000831117156101ad57600080fd5b919350915035610304565b005b3480156101c657600080fd5b506101cf6110b5565b6040805160208082528351818301528351919283929083019185019080838360005b838110156102095781810151838201526020016101f1565b50505050905090810190601f1680156102365780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561025057600080fd5b506102596110c7565b60408051918252519081900360200190f35b60007fffffffff0000000000000000000000000000000000000000000000000000000082167f01ffc9a70000000000000000000000000000000000000000000000000000000014806102fe57507fffffffff0000000000000000000000000000000000000000000000000000000082167f8564090700000000000000000000000000000000000000000000000000000000145b92915050565b6030861461035d576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001806118056026913960400191505060405180910390fd5b602084146103b6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252603681526020018061179c6036913960400191505060405180910390fd5b6060821461040f576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260298152602001806118786029913960400191505060405180910390fd5b670de0b6b3a7640000341015610470576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001806118526026913960400191505060405180910390fd5b633b9aca003406156104cd576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260338152602001806117d26033913960400191505060405180910390fd5b633b9aca00340467ffffffffffffffff811115610535576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602781526020018061182b6027913960400191505060405180910390fd5b6060610540826114ba565b90507f649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c589898989858a8a6105756020546114ba565b6040805160a0808252810189905290819060208201908201606083016080840160c085018e8e80828437600083820152601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01690910187810386528c815260200190508c8c808284376000838201819052601f9091017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01690920188810386528c5181528c51602091820193918e019250908190849084905b83811015610648578181015183820152602001610630565b50505050905090810190601f1680156106755780820380516001836020036101000a031916815260200191505b5086810383528881526020018989808284376000838201819052601f9091017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169092018881038452895181528951602091820193918b019250908190849084905b838110156106ef5781810151838201526020016106d7565b50505050905090810190601f16801561071c5780820380516001836020036101000a031916815260200191505b509d505050505050505050505050505060405180910390a1600060028a8a600060801b604051602001808484808284377fffffffffffffffffffffffffffffffff0000000000000000000000000000000090941691909301908152604080517ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0818403018152601090920190819052815191955093508392506020850191508083835b602083106107fc57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe090920191602091820191016107bf565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa158015610859573d6000803e3d6000fd5b5050506040513d602081101561086e57600080fd5b5051905060006002806108846040848a8c6116fe565b6040516020018083838082843780830192505050925050506040516020818303038152906040526040518082805190602001908083835b602083106108f857805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe090920191602091820191016108bb565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa158015610955573d6000803e3d6000fd5b5050506040513d602081101561096a57600080fd5b5051600261097b896040818d6116fe565b60405160009060200180848480828437919091019283525050604080518083038152602092830191829052805190945090925082918401908083835b602083106109f457805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe090920191602091820191016109b7565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa158015610a51573d6000803e3d6000fd5b5050506040513d6020811015610a6657600080fd5b5051604080516020818101949094528082019290925280518083038201815260609092019081905281519192909182918401908083835b60208310610ada57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09092019160209182019101610a9d565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa158015610b37573d6000803e3d6000fd5b5050506040513d6020811015610b4c57600080fd5b50516040805160208101858152929350600092600292839287928f928f92018383808284378083019250505093505050506040516020818303038152906040526040518082805190602001908083835b60208310610bd957805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09092019160209182019101610b9c565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa158015610c36573d6000803e3d6000fd5b5050506040513d6020811015610c4b57600080fd5b50516040518651600291889160009188916020918201918291908601908083835b60208310610ca957805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09092019160209182019101610c6c565b6001836020036101000a0380198251168184511680821785525050505050509050018367ffffffffffffffff191667ffffffffffffffff1916815260180182815260200193505050506040516020818303038152906040526040518082805190602001908083835b60208310610d4e57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09092019160209182019101610d11565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa158015610dab573d6000803e3d6000fd5b5050506040513d6020811015610dc057600080fd5b5051604080516020818101949094528082019290925280518083038201815260609092019081905281519192909182918401908083835b60208310610e3457805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09092019160209182019101610df7565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa158015610e91573d6000803e3d6000fd5b5050506040513d6020811015610ea657600080fd5b50519050858114610f02576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260548152602001806117486054913960600191505060405180910390fd5b60205463ffffffff11610f60576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260218152602001806117276021913960400191505060405180910390fd5b602080546001019081905560005b60208110156110a9578160011660011415610fa0578260008260208110610f9157fe5b0155506110ac95505050505050565b600260008260208110610faf57fe5b01548460405160200180838152602001828152602001925050506040516020818303038152906040526040518082805190602001908083835b6020831061102557805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09092019160209182019101610fe8565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa158015611082573d6000803e3d6000fd5b5050506040513d602081101561109757600080fd5b50519250600282049150600101610f6e565b50fe5b50505050505050565b60606110c26020546114ba565b905090565b6020546000908190815b60208110156112f05781600116600114156111e6576002600082602081106110f557fe5b01548460405160200180838152602001828152602001925050506040516020818303038152906040526040518082805190602001908083835b6020831061116b57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0909201916020918201910161112e565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa1580156111c8573d6000803e3d6000fd5b5050506040513d60208110156111dd57600080fd5b505192506112e2565b600283602183602081106111f657fe5b015460405160200180838152602001828152602001925050506040516020818303038152906040526040518082805190602001908083835b6020831061126b57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0909201916020918201910161122e565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa1580156112c8573d6000803e3d6000fd5b5050506040513d60208110156112dd57600080fd5b505192505b6002820491506001016110d1565b506002826112ff6020546114ba565b600060401b6040516020018084815260200183805190602001908083835b6020831061135a57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0909201916020918201910161131d565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790527fffffffffffffffffffffffffffffffffffffffffffffffff000000000000000095909516920191825250604080518083037ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8018152601890920190819052815191955093508392850191508083835b6020831061143f57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09092019160209182019101611402565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa15801561149c573d6000803e3d6000fd5b5050506040513d60208110156114b157600080fd5b50519250505090565b60408051600880825281830190925260609160208201818036833701905050905060c082901b8060071a60f81b826000815181106114f457fe5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053508060061a60f81b8260018151811061153757fe5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053508060051a60f81b8260028151811061157a57fe5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053508060041a60f81b826003815181106115bd57fe5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053508060031a60f81b8260048151811061160057fe5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053508060021a60f81b8260058151811061164357fe5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053508060011a60f81b8260068151811061168657fe5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053508060001a60f81b826007815181106116c957fe5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a90535050919050565b6000808585111561170d578182fd5b83861115611719578182fd5b505082019391909203915056fe4465706f736974436f6e74726163743a206d65726b6c6520747265652066756c6c4465706f736974436f6e74726163743a207265636f6e7374727563746564204465706f7369744461746120646f6573206e6f74206d6174636820737570706c696564206465706f7369745f646174615f726f6f744465706f736974436f6e74726163743a20696e76616c6964207769746864726177616c5f63726564656e7469616c73206c656e6774684465706f736974436f6e74726163743a206465706f7369742076616c7565206e6f74206d756c7469706c65206f6620677765694465706f736974436f6e74726163743a20696e76616c6964207075626b6579206c656e6774684465706f736974436f6e74726163743a206465706f7369742076616c756520746f6f20686967684465706f736974436f6e74726163743a206465706f7369742076616c756520746f6f206c6f774465706f736974436f6e74726163743a20696e76616c6964207369676e6174757265206c656e677468a2646970667358221220dceca8706b29e917dacf25fceef95acac8d90d765ac926663ce4096195952b6164736f6c634300060b0033",
+      "storage": {
+        "0x0000000000000000000000000000000000000000000000000000000000000022": "0xf5a5fd42d16a20302798ef6ed309979b43003d2320d9f0e8ea9831a92759fb4b",
+        "0x0000000000000000000000000000000000000000000000000000000000000023": "0xdb56114e00fdd4c1f85c892bf35ac9a89289aaecb1ebd0a96cde606a748b5d71",
+        "0x0000000000000000000000000000000000000000000000000000000000000024": "0xc78009fdf07fc56a11f122370658a353aaa542ed63e44c4bc15ff4cd105ab33c",
+        "0x0000000000000000000000000000000000000000000000000000000000000025": "0x536d98837f2dd165a55d5eeae91485954472d56f246df256bf3cae19352a123c",
+        "0x0000000000000000000000000000000000000000000000000000000000000026": "0x9efde052aa15429fae05bad4d0b1d7c64da64d03d7a1854a588c2cb8430c0d30",
+        "0x0000000000000000000000000000000000000000000000000000000000000027": "0xd88ddfeed400a8755596b21942c1497e114c302e6118290f91e6772976041fa1",
+        "0x0000000000000000000000000000000000000000000000000000000000000028": "0x87eb0ddba57e35f6d286673802a4af5975e22506c7cf4c64bb6be5ee11527f2c",
+        "0x0000000000000000000000000000000000000000000000000000000000000029": "0x26846476fd5fc54a5d43385167c95144f2643f533cc85bb9d16b782f8d7db193",
+        "0x000000000000000000000000000000000000000000000000000000000000002a": "0x506d86582d252405b840018792cad2bf1259f1ef5aa5f887e13cb2f0094f51e1",
+        "0x000000000000000000000000000000000000000000000000000000000000002b": "0xffff0ad7e659772f9534c195c815efc4014ef1e1daed4404c06385d11192e92b",
+        "0x000000000000000000000000000000000000000000000000000000000000002c": "0x6cf04127db05441cd833107a52be852868890e4317e6a02ab47683aa75964220",
+        "0x000000000000000000000000000000000000000000000000000000000000002d": "0xb7d05f875f140027ef5118a2247bbb84ce8f2f0f1123623085daf7960c329f5f",
+        "0x000000000000000000000000000000000000000000000000000000000000002e": "0xdf6af5f5bbdb6be9ef8aa618e4bf8073960867171e29676f8b284dea6a08a85e",
+        "0x000000000000000000000000000000000000000000000000000000000000002f": "0xb58d900f5e182e3c50ef74969ea16c7726c549757cc23523c369587da7293784",
+        "0x0000000000000000000000000000000000000000000000000000000000000030": "0xd49a7502ffcfb0340b1d7885688500ca308161a7f96b62df9d083b71fcc8f2bb",
+        "0x0000000000000000000000000000000000000000000000000000000000000031": "0x8fe6b1689256c0d385f42f5bbe2027a22c1996e110ba97c171d3e5948de92beb",
+        "0x0000000000000000000000000000000000000000000000000000000000000032": "0x8d0d63c39ebade8509e0ae3c9c3876fb5fa112be18f905ecacfecb92057603ab",
+        "0x0000000000000000000000000000000000000000000000000000000000000033": "0x95eec8b2e541cad4e91de38385f2e046619f54496c2382cb6cacd5b98c26f5a4",
+        "0x0000000000000000000000000000000000000000000000000000000000000034": "0xf893e908917775b62bff23294dbbe3a1cd8e6cc1c35b4801887b646a6f81f17f",
+        "0x0000000000000000000000000000000000000000000000000000000000000035": "0xcddba7b592e3133393c16194fac7431abf2f5485ed711db282183c819e08ebaa",
+        "0x0000000000000000000000000000000000000000000000000000000000000036": "0x8a8d7fe3af8caa085a7639a832001457dfb9128a8061142ad0335629ff23ff9c",
+        "0x0000000000000000000000000000000000000000000000000000000000000037": "0xfeb3c337d7a51a6fbf00b9e34c52e1c9195c969bd4e7a0bfd51d5c5bed9c1167",
+        "0x0000000000000000000000000000000000000000000000000000000000000038": "0xe71f0aa83cc32edfbefa9f4d3e0174ca85182eec9f3a09f6a6c0df6377a510d7",
+        "0x0000000000000000000000000000000000000000000000000000000000000039": "0x31206fa80a50bb6abe29085058f16212212a60eec8f049fecb92d8c8e0a84bc0",
+        "0x000000000000000000000000000000000000000000000000000000000000003a": "0x21352bfecbeddde993839f614c3dac0a3ee37543f9b412b16199dc158e23b544",
+        "0x000000000000000000000000000000000000000000000000000000000000003b": "0x619e312724bb6d7c3153ed9de791d764a366b389af13c58bf8a8d90481a46765",
+        "0x000000000000000000000000000000000000000000000000000000000000003c": "0x7cdd2986268250628d0c10e385c58c6191e6fbe05191bcc04f133f2cea72c1c4",
+        "0x000000000000000000000000000000000000000000000000000000000000003d": "0x848930bd7ba8cac54661072113fb278869e07bb8587f91392933374d017bcbe1",
+        "0x000000000000000000000000000000000000000000000000000000000000003e": "0x8869ff2c22b28cc10510d9853292803328be4fb0e80495e8bb8d271f5b889636",
+        "0x000000000000000000000000000000000000000000000000000000000000003f": "0xb5fe28e79f1b850f8658246ce9b6a1e7b49fc06db7143e8fe0b4f2b0c5523a5c",
+        "0x0000000000000000000000000000000000000000000000000000000000000040": "0x985e929f70af28d0bdd1a90a808f977f597c7c778c489e98d3bd8910d31ac0f7"
+      }
+    },
+    "0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02": {
+      "balance": "0",
+      "nonce": "1",
+      "code": "0x3373fffffffffffffffffffffffffffffffffffffffe14604d57602036146024575f5ffd5b5f35801560495762001fff810690815414603c575f5ffd5b62001fff01545f5260205ff35b5f5ffd5b62001fff42064281555f359062001fff015500"
+    },
+    "0xa2A6d93439144FFE4D27c9E088dCD8b783946263": {
+      "balance": "1000000000000000000000000"
+    },
+    "0xBc11295936Aa79d594139de1B2e12629414F3BDB": {
+      "balance": "1000000000000000000000000"
+    },
+    "0x7cF5b79bfe291A67AB02b393E456cCc4c266F753": {
+      "balance": "1000000000000000000000000"
+    },
+    "0xaaec86394441f915bce3e6ab399977e9906f3b69": {
+      "balance": "1000000000000000000000000"
+    },
+    "0xF47CaE1CF79ca6758Bfc787dbD21E6bdBe7112B8": {
+      "balance": "1000000000000000000000000"
+    },
+    "0xd7eDDB78ED295B3C9629240E8924fb8D8874ddD8": {
+      "balance": "1000000000000000000000000"
+    },
+    "0x8b7F0977Bb4f0fBE7076FA22bC24acA043583F5e": {
+      "balance": "1000000000000000000000000"
+    },
+    "0xe2e2659028143784d557bcec6ff3a0721048880a": {
+      "balance": "1000000000000000000000000"
+    },
+    "0xd9a5179f091d85051d3c982785efd1455cec8699": {
+      "balance": "1000000000000000000000000"
+    },
+    "0xbeef32ca5b9a198d27B4e02F4c70439fE60356Cf": {
+      "balance": "1000000000000000000000000"
+    },
+    "0x0000006916a87b82333f4245046623b23794c65c": {
+      "balance": "10000000000000000000000000"
+    },
+    "0xb21c33de1fab3fa15499c62b59fe0cc3250020d1": {
+      "balance": "100000000000000000000000000"
+    },
+    "0x10F5d45854e038071485AC9e402308cF80D2d2fE": {
+      "balance": "100000000000000000000000000"
+    },
+    "0xd7d76c58b3a519e9fA6Cc4D22dC017259BC49F1E": {
+      "balance": "100000000000000000000000000"
+    },
+    "0x799D329e5f583419167cD722962485926E338F4a": {
+      "balance": "1000000000000000000"
+    },
+    "0x4c2ae482593505f0163cdefc073e81c63cda4107": {
+      "balance": "1000000000000000000000000"
+    },
+    "0xa8e8f14732658e4b51e8711931053a8a69baf2b1": {
+      "balance": "1000000000000000000000000"
+    },
+    "0xe0a2bd4258d2768837baa26a28fe71dc079f84c7": {
+      "balance": "100000000000000000000000000"
+    },
+    "0x1eA692E68a7765dE26FC03A6D74EE5B56A7e2b4d": {
+      "balance": "100000000000000000000000000"
+    },
+    "0x57c3dfd40A86628B67721115d7A03C9F341d7718": {
+      "balance": "100000000000000000000000000"
+    },
+    "0xc90E920F4DCfd4954230edCaB168D0C5B9561e03": {
+      "balance": "1000000000000000000000000000"
+    },
+    "0x6Cc9397c3B38739daCbfaA68EaD5F5D77Ba5F455": {
+      "balance": "10000000000000000000000000"
+    },
+    "0x992775d32fd0ec76b95C5E76CeEA92ED5a4bE1F9": {
+      "balance": "10000000000000000000000000"
+    }
+  },
+  "coinbase": "0x0000000000000000000000000000000000000000",
+  "difficulty": "0x01",
+  "extraData": "",
+  "gasLimit": "0x1c9c380",
+  "nonce": "0x1234",
+  "mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "timestamp": "1720119600"
+}
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/BlockHeaderValidationRulesetFactory.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/BlockHeaderValidationRulesetFactory.java
index 0274736c0f..563f31f597 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/BlockHeaderValidationRulesetFactory.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/BlockHeaderValidationRulesetFactory.java
@@ -17,7 +17,7 @@ package org.hyperledger.besu.consensus.clique;
 import static org.hyperledger.besu.ethereum.mainnet.AbstractGasLimitSpecification.DEFAULT_MAX_GAS_LIMIT;
 import static org.hyperledger.besu.ethereum.mainnet.AbstractGasLimitSpecification.DEFAULT_MIN_GAS_LIMIT;
 
-import org.hyperledger.besu.config.MergeConfigOptions;
+import org.hyperledger.besu.config.MergeConfiguration;
 import org.hyperledger.besu.consensus.clique.headervalidationrules.CliqueDifficultyValidationRule;
 import org.hyperledger.besu.consensus.clique.headervalidationrules.CliqueExtraDataValidationRule;
 import org.hyperledger.besu.consensus.clique.headervalidationrules.CliqueNoEmptyBlockValidationRule;
@@ -69,7 +69,7 @@ public class BlockHeaderValidationRulesetFactory {
         createEmptyBlocks,
         epochManager,
         baseFeeMarket,
-        MergeConfigOptions.isMergeEnabled());
+        MergeConfiguration.isMergeEnabled());
   }
 
   /**
diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java
index 9c1a3df075..09c1b28af4 100644
--- a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java
+++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java
@@ -32,7 +32,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.config.MergeConfigOptions;
+import org.hyperledger.besu.config.MergeConfiguration;
 import org.hyperledger.besu.consensus.merge.MergeContext;
 import org.hyperledger.besu.consensus.merge.PayloadWrapper;
 import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator.ForkchoiceResult;
@@ -204,7 +204,7 @@ public class MergeCoordinatorTest implements MergeGenesisConfigHelper {
               return blockCreationTask;
             });
 
-    MergeConfigOptions.setMergeEnabled(true);
+    MergeConfiguration.setMergeEnabled(true);
 
     when(ethContext.getEthPeers().subscribeConnect(any())).thenReturn(1L);
     this.transactionPool =
diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeReorgTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeReorgTest.java
index 9b6cf907d2..7b111268e0 100644
--- a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeReorgTest.java
+++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeReorgTest.java
@@ -19,7 +19,7 @@ import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider
 import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
 import static org.mockito.Mockito.mock;
 
-import org.hyperledger.besu.config.MergeConfigOptions;
+import org.hyperledger.besu.config.MergeConfiguration;
 import org.hyperledger.besu.consensus.merge.MergeContext;
 import org.hyperledger.besu.consensus.merge.PostMergeContext;
 import org.hyperledger.besu.datatypes.Address;
@@ -89,7 +89,7 @@ public class MergeReorgTest implements MergeGenesisConfigHelper {
     genesisState.writeStateTo(mutable);
     mutable.persist(null);
     mergeContext.setTerminalTotalDifficulty(Difficulty.of(1001));
-    MergeConfigOptions.setMergeEnabled(true);
+    MergeConfiguration.setMergeEnabled(true);
     this.coordinator =
         new MergeCoordinator(
             protocolContext,
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java
index 538060a905..c7ba5a4f93 100644
--- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java
@@ -68,7 +68,6 @@ public class JsonRpcTestMethodsFactory {
   private static final String CLIENT_NODE_NAME = "TestClientVersion/0.1.0";
   private static final String CLIENT_VERSION = "0.1.0";
   private static final String CLIENT_COMMIT = "12345678";
-  private static final BigInteger NETWORK_ID = BigInteger.valueOf(123);
 
   private final BlockchainImporter importer;
   private final MutableBlockchain blockchain;
@@ -76,6 +75,7 @@ public class JsonRpcTestMethodsFactory {
   private final ProtocolContext context;
   private final BlockchainQueries blockchainQueries;
   private final Synchronizer synchronizer;
+  private final ProtocolSchedule protocolSchedule;
 
   public JsonRpcTestMethodsFactory(final BlockchainImporter importer) {
     this.importer = importer;
@@ -84,7 +84,7 @@ public class JsonRpcTestMethodsFactory {
     this.importer.getGenesisState().writeStateTo(stateArchive.getMutable());
     this.context = new ProtocolContext(blockchain, stateArchive, null, new BadBlockManager());
 
-    final ProtocolSchedule protocolSchedule = importer.getProtocolSchedule();
+    this.protocolSchedule = importer.getProtocolSchedule();
     this.synchronizer = mock(Synchronizer.class);
 
     for (final Block block : importer.getBlocks()) {
@@ -106,6 +106,7 @@ public class JsonRpcTestMethodsFactory {
     this.blockchain = blockchain;
     this.stateArchive = stateArchive;
     this.context = context;
+    this.protocolSchedule = importer.getProtocolSchedule();
     this.blockchainQueries =
         new BlockchainQueries(
             importer.getProtocolSchedule(),
@@ -126,6 +127,7 @@ public class JsonRpcTestMethodsFactory {
     this.stateArchive = stateArchive;
     this.context = context;
     this.synchronizer = synchronizer;
+    this.protocolSchedule = importer.getProtocolSchedule();
     this.blockchainQueries =
         new BlockchainQueries(
             importer.getProtocolSchedule(),
@@ -142,6 +144,10 @@ public class JsonRpcTestMethodsFactory {
     return stateArchive;
   }
 
+  public BigInteger getChainId() {
+    return protocolSchedule.getChainId().get();
+  }
+
   public Map<String, JsonRpcMethod> methods() {
     final P2PNetwork peerDiscovery = mock(P2PNetwork.class);
     final EthPeers ethPeers = mock(EthPeers.class);
@@ -183,7 +189,7 @@ public class JsonRpcTestMethodsFactory {
             CLIENT_NODE_NAME,
             CLIENT_VERSION,
             CLIENT_COMMIT,
-            NETWORK_ID,
+            getChainId(),
             new StubGenesisConfigOptions(),
             peerDiscovery,
             blockchainQueries,
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthCallIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthCallIntegrationTest.java
index 5f03d7f4d5..9fb692ef82 100644
--- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthCallIntegrationTest.java
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthCallIntegrationTest.java
@@ -30,6 +30,7 @@ import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSucces
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType;
 import org.hyperledger.besu.testutil.BlockTestUtil;
 
+import java.math.BigInteger;
 import java.util.Map;
 
 import com.google.common.base.Charsets;
@@ -142,6 +143,7 @@ public class EthCallIntegrationTest {
   public void shouldReturnSuccessWithValidMaxFeePerGas() {
     final JsonCallParameter callParameter =
         new JsonCallParameter.JsonCallParameterBuilder()
+            .withChainId(BLOCKCHAIN.getChainId())
             .withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
             .withTo(Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"))
             .withMaxFeePerGas(Wei.fromHexString("0x3B9ACA01"))
@@ -158,6 +160,26 @@ public class EthCallIntegrationTest {
     assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
+  @Test
+  public void shouldReturnErrorWithInvalidChainId() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter.JsonCallParameterBuilder()
+            .withChainId(BLOCKCHAIN.getChainId().add(BigInteger.ONE))
+            .withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
+            .withTo(Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"))
+            .withMaxFeePerGas(Wei.fromHexString("0x3B9ACA01"))
+            .withInput(Bytes.fromHexString("0x2e64cec1"))
+            .build();
+
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(null, RpcErrorType.WRONG_CHAIN_ID);
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
   @Test
   public void shouldReturnSuccessWithValidMaxFeePerGasAndMaxPriorityFeePerGas() {
     final JsonCallParameter callParameter =
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthEstimateGasIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthEstimateGasIntegrationTest.java
index 84447dfc9d..5fde9ccecb 100644
--- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthEstimateGasIntegrationTest.java
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthEstimateGasIntegrationTest.java
@@ -25,10 +25,15 @@ import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 import org.hyperledger.besu.testutil.BlockTestUtil;
 
+import java.math.BigInteger;
 import java.util.List;
 import java.util.Map;
 
@@ -112,6 +117,7 @@ public class EthEstimateGasIntegrationTest {
   public void shouldReturnExpectedValueForContractDeploy_WithAccessList() {
     final JsonCallParameter callParameter =
         new JsonCallParameter.JsonCallParameterBuilder()
+            .withChainId(BLOCKCHAIN.getChainId())
             .withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
             .withInput(
                 Bytes.fromHexString(
@@ -124,6 +130,30 @@ public class EthEstimateGasIntegrationTest {
     assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
+  @Test
+  public void shouldReturnErrorWithInvalidChainId() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter.JsonCallParameterBuilder()
+            .withChainId(BLOCKCHAIN.getChainId().add(BigInteger.ONE))
+            .withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
+            .withTo(Address.fromHexString("0x8888f1f195afa192cfee860698584c030f4c9db1"))
+            .withValue(Wei.ONE)
+            .build();
+
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(
+            null,
+            JsonRpcError.from(
+                ValidationResult.invalid(
+                    TransactionInvalidReason.WRONG_CHAIN_ID,
+                    "transaction was meant for chain id 1983 and not this chain id 1982")));
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
   private List<AccessListEntry> createAccessList() {
     return List.of(
         new AccessListEntry(
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcConfiguration.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcConfiguration.java
index 2ed9c56d54..726e205d1c 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcConfiguration.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcConfiguration.java
@@ -32,7 +32,7 @@ import java.util.Optional;
 import com.google.common.base.MoreObjects;
 
 public class JsonRpcConfiguration {
-  private static final String DEFAULT_JSON_RPC_HOST = "127.0.0.1";
+  public static final String DEFAULT_JSON_RPC_HOST = "127.0.0.1";
   public static final int DEFAULT_JSON_RPC_PORT = 8545;
   public static final int DEFAULT_ENGINE_JSON_RPC_PORT = 8551;
   public static final int DEFAULT_MAX_ACTIVE_CONNECTIONS = 80;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractEstimateGas.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractEstimateGas.java
index 4cbfb818db..8e826caf9e 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractEstimateGas.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractEstimateGas.java
@@ -103,6 +103,7 @@ public abstract class AbstractEstimateGas extends AbstractBlockParameterMethod {
   protected CallParameter overrideGasLimitAndPrice(
       final JsonCallParameter callParams, final long gasLimit) {
     return new CallParameter(
+        callParams.getChainId(),
         callParams.getFrom(),
         callParams.getTo(),
         gasLimit,
@@ -111,7 +112,9 @@ public abstract class AbstractEstimateGas extends AbstractBlockParameterMethod {
         callParams.getMaxFeePerGas(),
         callParams.getValue(),
         callParams.getPayload(),
-        callParams.getAccessList());
+        callParams.getAccessList(),
+        callParams.getMaxFeePerBlobGas(),
+        callParams.getBlobVersionedHashes());
   }
 
   /**
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetClientVersionV1.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetClientVersionV1.java
index 149728186b..011ce577a6 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetClientVersionV1.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetClientVersionV1.java
@@ -22,6 +22,9 @@ import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcRespon
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EngineGetClientVersionResultV1;
 
+import java.util.Collections;
+import java.util.List;
+
 import io.vertx.core.Vertx;
 
 public class EngineGetClientVersionV1 extends ExecutionEngineJsonRpcMethod {
@@ -51,9 +54,10 @@ public class EngineGetClientVersionV1 extends ExecutionEngineJsonRpcMethod {
   public JsonRpcResponse syncResponse(final JsonRpcRequestContext request) {
     String safeCommit =
         (commit != null && commit.length() >= 8) ? commit.substring(0, 8) : "unknown";
-    return new JsonRpcSuccessResponse(
-        request.getRequest().getId(),
-        new EngineGetClientVersionResultV1(
-            ENGINE_CLIENT_CODE, ENGINE_CLIENT_NAME, clientVersion, safeCommit));
+    List<EngineGetClientVersionResultV1> versions =
+        Collections.singletonList(
+            new EngineGetClientVersionResultV1(
+                ENGINE_CLIENT_CODE, ENGINE_CLIENT_NAME, clientVersion, safeCommit));
+    return new JsonRpcSuccessResponse(request.getRequest().getId(), versions);
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java
index 987b68c2e2..85dabda571 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java
@@ -18,10 +18,12 @@ import org.hyperledger.besu.datatypes.AccessListEntry;
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.VersionedHash;
 import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.json.ChainIdDeserializer;
 import org.hyperledger.besu.ethereum.core.json.GasDeserializer;
 import org.hyperledger.besu.ethereum.core.json.HexStringDeserializer;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
 
+import java.math.BigInteger;
 import java.util.List;
 import java.util.Optional;
 
@@ -41,6 +43,7 @@ import org.slf4j.LoggerFactory;
  *
  * <pre>{@code
  * JsonCallParameter param = new JsonCallParameter.JsonCallParameterBuilder()
+ *     .withChainId(Optional.of(BigInteger.ONE))
  *     .withFrom(Address.fromHexString("0x..."))
  *     .withTo(Address.fromHexString("0x..."))
  *     .withGas(21000L)
@@ -71,6 +74,7 @@ public class JsonCallParameter extends CallParameter {
   private final Optional<Boolean> strict;
 
   private JsonCallParameter(
+      final Optional<BigInteger> chainId,
       final Address from,
       final Address to,
       final Long gasLimit,
@@ -85,6 +89,7 @@ public class JsonCallParameter extends CallParameter {
       final Optional<List<VersionedHash>> blobVersionedHashes) {
 
     super(
+        chainId,
         from,
         to,
         gasLimit,
@@ -115,6 +120,7 @@ public class JsonCallParameter extends CallParameter {
    */
   public static final class JsonCallParameterBuilder {
     private Optional<Boolean> strict = Optional.empty();
+    private Optional<BigInteger> chainId = Optional.empty();
     private Address from;
     private Address to;
     private long gas = -1;
@@ -145,6 +151,18 @@ public class JsonCallParameter extends CallParameter {
       return this;
     }
 
+    /**
+     * Sets the optional "chainId" for the {@link JsonCallParameter}.
+     *
+     * @param chainId the chainId
+     * @return the {@link JsonCallParameterBuilder} instance for chaining
+     */
+    @JsonDeserialize(using = ChainIdDeserializer.class)
+    public JsonCallParameterBuilder withChainId(final BigInteger chainId) {
+      this.chainId = Optional.of(chainId);
+      return this;
+    }
+
     /**
      * Sets the "from" address for the {@link JsonCallParameter}. This address represents the sender
      * of the call.
@@ -346,6 +364,7 @@ public class JsonCallParameter extends CallParameter {
       final Bytes payload = input != null ? input : data;
 
       return new JsonCallParameter(
+          chainId,
           from,
           to,
           gas,
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetClientVersionV1Test.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetClientVersionV1Test.java
index 1aa0def7e2..d1d53832c1 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetClientVersionV1Test.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetClientVersionV1Test.java
@@ -23,6 +23,8 @@ import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcRespon
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EngineGetClientVersionResultV1;
 
+import java.util.List;
+
 import io.vertx.core.Vertx;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -61,9 +63,18 @@ class EngineGetClientVersionV1Test {
 
     assertThat(actualResult).isInstanceOf(JsonRpcSuccessResponse.class);
     JsonRpcSuccessResponse successResponse = (JsonRpcSuccessResponse) actualResult;
-    assertThat(successResponse.getResult()).isInstanceOf(EngineGetClientVersionResultV1.class);
+
+    assertThat(successResponse.getResult()).isInstanceOf(List.class);
+
+    List<?> resultList = (List<?>) successResponse.getResult();
+    assertThat(resultList).hasSize(1);
+
+    Object firstElement = resultList.get(0);
+    assertThat(firstElement).isInstanceOf(EngineGetClientVersionResultV1.class);
+
     EngineGetClientVersionResultV1 actualEngineGetClientVersionResultV1 =
-        (EngineGetClientVersionResultV1) successResponse.getResult();
+        (EngineGetClientVersionResultV1) firstElement;
+
     assertThat(actualEngineGetClientVersionResultV1.getName()).isEqualTo(ENGINE_CLIENT_NAME);
     assertThat(actualEngineGetClientVersionResultV1.getCode()).isEqualTo(ENGINE_CLIENT_CODE);
     assertThat(actualEngineGetClientVersionResultV1.getVersion()).isEqualTo(CLIENT_VERSION);
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/json/ChainIdDeserializer.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/json/ChainIdDeserializer.java
new file mode 100644
index 0000000000..04be922ecd
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/json/ChainIdDeserializer.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.json;
+
+import java.io.IOException;
+import java.math.BigInteger;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tuweni.units.bigints.UInt256;
+
+public class ChainIdDeserializer extends StdDeserializer<BigInteger> {
+
+  public ChainIdDeserializer() {
+    this(null);
+  }
+
+  public ChainIdDeserializer(final Class<?> vc) {
+    super(vc);
+  }
+
+  @Override
+  public BigInteger deserialize(final JsonParser jsonparser, final DeserializationContext context)
+      throws IOException {
+    final var chainId =
+        UInt256.fromHexString(jsonparser.getCodec().readValue(jsonparser, String.class))
+            .toBigInteger();
+    if (chainId.signum() <= 0) {
+      throw new IllegalArgumentException("Non positive chain id: " + chainId);
+    }
+    return chainId;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderValidator.java
index 5f1fdff0f4..0598c817bd 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderValidator.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderValidator.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
-import org.hyperledger.besu.config.MergeConfigOptions;
+import org.hyperledger.besu.config.MergeConfiguration;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
 import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
@@ -130,7 +130,7 @@ public final class MainnetBlockHeaderValidator {
 
   public static BlockHeaderValidator.Builder createBaseFeeMarketValidator(
       final BaseFeeMarket baseFeeMarket) {
-    return createBaseFeeMarketValidator(baseFeeMarket, MergeConfigOptions.isMergeEnabled());
+    return createBaseFeeMarketValidator(baseFeeMarket, MergeConfiguration.isMergeEnabled());
   }
 
   @VisibleForTesting
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/CallParameter.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/CallParameter.java
index 292c65cac6..ce2e63a71a 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/CallParameter.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/CallParameter.java
@@ -20,6 +20,7 @@ import org.hyperledger.besu.datatypes.VersionedHash;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.Transaction;
 
+import java.math.BigInteger;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -28,6 +29,7 @@ import org.apache.tuweni.bytes.Bytes;
 
 // Represents parameters for eth_call and eth_estimateGas JSON-RPC methods.
 public class CallParameter {
+  private final Optional<BigInteger> chainId;
 
   private final Address from;
 
@@ -56,6 +58,7 @@ public class CallParameter {
       final Wei gasPrice,
       final Wei value,
       final Bytes payload) {
+    this.chainId = Optional.empty();
     this.from = from;
     this.to = to;
     this.gasLimit = gasLimit;
@@ -79,6 +82,7 @@ public class CallParameter {
       final Wei value,
       final Bytes payload,
       final Optional<List<AccessListEntry>> accessList) {
+    this.chainId = Optional.empty();
     this.from = from;
     this.to = to;
     this.gasLimit = gasLimit;
@@ -93,6 +97,7 @@ public class CallParameter {
   }
 
   public CallParameter(
+      final Optional<BigInteger> chainId,
       final Address from,
       final Address to,
       final long gasLimit,
@@ -104,6 +109,7 @@ public class CallParameter {
       final Optional<List<AccessListEntry>> accessList,
       final Optional<Wei> maxFeePerBlobGas,
       final Optional<List<VersionedHash>> blobVersionedHashes) {
+    this.chainId = chainId;
     this.from = from;
     this.to = to;
     this.gasLimit = gasLimit;
@@ -117,6 +123,10 @@ public class CallParameter {
     this.blobVersionedHashes = blobVersionedHashes;
   }
 
+  public Optional<BigInteger> getChainId() {
+    return chainId;
+  }
+
   public Address getFrom() {
     return from;
   }
@@ -171,6 +181,7 @@ public class CallParameter {
     }
     final CallParameter that = (CallParameter) o;
     return gasLimit == that.gasLimit
+        && chainId.equals(that.chainId)
         && Objects.equals(from, that.from)
         && Objects.equals(to, that.to)
         && Objects.equals(gasPrice, that.gasPrice)
@@ -186,6 +197,7 @@ public class CallParameter {
   @Override
   public int hashCode() {
     return Objects.hash(
+        chainId,
         from,
         to,
         gasLimit,
@@ -202,7 +214,9 @@ public class CallParameter {
   @Override
   public String toString() {
     return "CallParameter{"
-        + "from="
+        + "chainId="
+        + chainId
+        + ", from="
         + from
         + ", to="
         + to
@@ -229,6 +243,7 @@ public class CallParameter {
 
   public static CallParameter fromTransaction(final Transaction tx) {
     return new CallParameter(
+        tx.getChainId(),
         tx.getSender(),
         tx.getTo().orElse(null),
         tx.getGasLimit(),
@@ -244,6 +259,7 @@ public class CallParameter {
 
   public static CallParameter fromTransaction(final org.hyperledger.besu.datatypes.Transaction tx) {
     return new CallParameter(
+        tx.getChainId(),
         tx.getSender(),
         tx.getTo().orElse(null),
         tx.getGasLimit(),
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java
index 5e78256a78..321dc965ec 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java
@@ -369,10 +369,13 @@ public class TransactionSimulator {
       transactionBuilder.maxFeePerBlobGas(maxFeePerBlobGas);
     }
     if (transactionBuilder.getTransactionType().requiresChainId()) {
-      transactionBuilder.chainId(
-          protocolSchedule
-              .getChainId()
-              .orElse(BigInteger.ONE)); // needed to make some transactions valid
+      callParams
+          .getChainId()
+          .ifPresentOrElse(
+              transactionBuilder::chainId,
+              () ->
+                  // needed to make some transactions valid
+                  transactionBuilder.chainId(protocolSchedule.getChainId().orElse(BigInteger.ONE)));
     }
 
     final Transaction transaction = transactionBuilder.build();
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorTest.java
index 73fa402abb..c6c676c415 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorTest.java
@@ -858,6 +858,7 @@ public class TransactionSimulatorTest {
       final int numberOfBlobs) {
     BlobsWithCommitments bwc = new BlobTestFixture().createBlobsWithCommitments(numberOfBlobs);
     return new CallParameter(
+        Optional.of(BigInteger.ONE),
         Address.fromHexString("0x0"),
         Address.fromHexString("0x0"),
         gasLimit,
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/peertask/PeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/peertask/PeerTask.java
index 1c5ee76c9a..4436022c9a 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/peertask/PeerTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/peertask/PeerTask.java
@@ -55,7 +55,7 @@ public interface PeerTask<T> {
    *
    * @return the Collection of behaviors this task is expected to exhibit in the PeetTaskExecutor
    */
-  Collection<PeerTaskRetryBehavior> getPeerTaskBehaviors();
+  Collection<PeerTaskRetryBehavior> getPeerTaskRetryBehaviors();
 
   /**
    * Gets a Predicate that checks if an EthPeer is suitable for this PeerTask
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/peertask/PeerTaskExecutor.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/peertask/PeerTaskExecutor.java
index 2d9a6edfce..1d56c61a7e 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/peertask/PeerTaskExecutor.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/peertask/PeerTaskExecutor.java
@@ -34,9 +34,9 @@ import java.util.concurrent.TimeoutException;
 /** Manages the execution of PeerTasks, respecting their PeerTaskRetryBehavior */
 public class PeerTaskExecutor {
 
-  public static final int RETRIES_WITH_SAME_PEER = 3;
-  public static final int RETRIES_WITH_OTHER_PEER = 3;
-  public static final int NO_RETRIES = 1;
+  public static final int RETRIES_WITH_SAME_PEER = 2;
+  public static final int RETRIES_WITH_OTHER_PEER = 2;
+  public static final int NO_RETRIES = 0;
   private final PeerSelector peerSelector;
   private final PeerTaskRequestSender requestSender;
   private final EthScheduler ethScheduler;
@@ -61,8 +61,8 @@ public class PeerTaskExecutor {
 
   public <T> PeerTaskExecutorResult<T> execute(final PeerTask<T> peerTask) {
     PeerTaskExecutorResult<T> executorResult;
-    int triesRemaining =
-        peerTask.getPeerTaskBehaviors().contains(PeerTaskRetryBehavior.RETRY_WITH_OTHER_PEERS)
+    int retriesRemaining =
+        peerTask.getPeerTaskRetryBehaviors().contains(PeerTaskRetryBehavior.RETRY_WITH_OTHER_PEERS)
             ? RETRIES_WITH_OTHER_PEER
             : NO_RETRIES;
     final Collection<EthPeer> usedEthPeers = new HashSet<>();
@@ -81,7 +81,7 @@ public class PeerTaskExecutor {
             new PeerTaskExecutorResult<>(
                 Optional.empty(), PeerTaskExecutorResponseCode.NO_PEER_AVAILABLE);
       }
-    } while (--triesRemaining > 0
+    } while (retriesRemaining-- > 0
         && executorResult.responseCode() != PeerTaskExecutorResponseCode.SUCCESS);
 
     return executorResult;
@@ -96,8 +96,8 @@ public class PeerTaskExecutor {
       final PeerTask<T> peerTask, final EthPeer peer) {
     MessageData requestMessageData = peerTask.getRequestMessage();
     PeerTaskExecutorResult<T> executorResult;
-    int triesRemaining =
-        peerTask.getPeerTaskBehaviors().contains(PeerTaskRetryBehavior.RETRY_WITH_SAME_PEER)
+    int retriesRemaining =
+        peerTask.getPeerTaskRetryBehaviors().contains(PeerTaskRetryBehavior.RETRY_WITH_SAME_PEER)
             ? RETRIES_WITH_SAME_PEER
             : NO_RETRIES;
     do {
@@ -136,7 +136,7 @@ public class PeerTaskExecutor {
             new PeerTaskExecutorResult<>(
                 Optional.empty(), PeerTaskExecutorResponseCode.INTERNAL_SERVER_ERROR);
       }
-    } while (--triesRemaining > 0
+    } while (retriesRemaining-- > 0
         && executorResult.responseCode() != PeerTaskExecutorResponseCode.SUCCESS
         && executorResult.responseCode() != PeerTaskExecutorResponseCode.PEER_DISCONNECTED
         && sleepBetweenRetries());
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/peertask/PeerTaskExecutorTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/peertask/PeerTaskExecutorTest.java
index 98afe58b11..1bad6f2cc0 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/peertask/PeerTaskExecutorTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/peertask/PeerTaskExecutorTest.java
@@ -71,7 +71,7 @@ public class PeerTaskExecutorTest {
     Object responseObject = new Object();
 
     Mockito.when(peerTask.getRequestMessage()).thenReturn(requestMessageData);
-    Mockito.when(peerTask.getPeerTaskBehaviors()).thenReturn(Collections.emptyList());
+    Mockito.when(peerTask.getPeerTaskRetryBehaviors()).thenReturn(Collections.emptyList());
     Mockito.when(peerTask.getSubProtocol()).thenReturn(subprotocol);
     Mockito.when(subprotocol.getName()).thenReturn("subprotocol");
     Mockito.when(requestSender.sendRequest(subprotocol, requestMessageData, ethPeer))
@@ -99,7 +99,7 @@ public class PeerTaskExecutorTest {
     int requestMessageDataCode = 123;
 
     Mockito.when(peerTask.getRequestMessage()).thenReturn(requestMessageData);
-    Mockito.when(peerTask.getPeerTaskBehaviors())
+    Mockito.when(peerTask.getPeerTaskRetryBehaviors())
         .thenReturn(List.of(PeerTaskRetryBehavior.RETRY_WITH_SAME_PEER));
 
     Mockito.when(peerTask.getSubProtocol()).thenReturn(subprotocol);
@@ -129,7 +129,7 @@ public class PeerTaskExecutorTest {
           TimeoutException {
 
     Mockito.when(peerTask.getRequestMessage()).thenReturn(requestMessageData);
-    Mockito.when(peerTask.getPeerTaskBehaviors()).thenReturn(Collections.emptyList());
+    Mockito.when(peerTask.getPeerTaskRetryBehaviors()).thenReturn(Collections.emptyList());
     Mockito.when(peerTask.getSubProtocol()).thenReturn(subprotocol);
     Mockito.when(subprotocol.getName()).thenReturn("subprotocol");
     Mockito.when(requestSender.sendRequest(subprotocol, requestMessageData, ethPeer))
@@ -151,7 +151,7 @@ public class PeerTaskExecutorTest {
     int requestMessageDataCode = 123;
 
     Mockito.when(peerTask.getRequestMessage()).thenReturn(requestMessageData);
-    Mockito.when(peerTask.getPeerTaskBehaviors()).thenReturn(Collections.emptyList());
+    Mockito.when(peerTask.getPeerTaskRetryBehaviors()).thenReturn(Collections.emptyList());
     Mockito.when(peerTask.getSubProtocol()).thenReturn(subprotocol);
     Mockito.when(subprotocol.getName()).thenReturn("subprotocol");
     Mockito.when(requestSender.sendRequest(subprotocol, requestMessageData, ethPeer))
@@ -176,7 +176,7 @@ public class PeerTaskExecutorTest {
           InvalidPeerTaskResponseException {
 
     Mockito.when(peerTask.getRequestMessage()).thenReturn(requestMessageData);
-    Mockito.when(peerTask.getPeerTaskBehaviors()).thenReturn(Collections.emptyList());
+    Mockito.when(peerTask.getPeerTaskRetryBehaviors()).thenReturn(Collections.emptyList());
     Mockito.when(peerTask.getSubProtocol()).thenReturn(subprotocol);
     Mockito.when(subprotocol.getName()).thenReturn("subprotocol");
     Mockito.when(requestSender.sendRequest(subprotocol, requestMessageData, ethPeer))
@@ -200,14 +200,13 @@ public class PeerTaskExecutorTest {
           ExecutionException,
           InterruptedException,
           TimeoutException,
-          InvalidPeerTaskResponseException,
-          NoAvailablePeerException {
+          InvalidPeerTaskResponseException {
     Object responseObject = new Object();
 
     Mockito.when(peerSelector.getPeer(Mockito.any(Predicate.class))).thenReturn(ethPeer);
 
     Mockito.when(peerTask.getRequestMessage()).thenReturn(requestMessageData);
-    Mockito.when(peerTask.getPeerTaskBehaviors()).thenReturn(Collections.emptyList());
+    Mockito.when(peerTask.getPeerTaskRetryBehaviors()).thenReturn(Collections.emptyList());
     Mockito.when(peerTask.getSubProtocol()).thenReturn(subprotocol);
     Mockito.when(subprotocol.getName()).thenReturn("subprotocol");
     Mockito.when(requestSender.sendRequest(subprotocol, requestMessageData, ethPeer))
@@ -241,7 +240,7 @@ public class PeerTaskExecutorTest {
         .thenReturn(peer2);
 
     Mockito.when(peerTask.getRequestMessage()).thenReturn(requestMessageData);
-    Mockito.when(peerTask.getPeerTaskBehaviors())
+    Mockito.when(peerTask.getPeerTaskRetryBehaviors())
         .thenReturn(List.of(PeerTaskRetryBehavior.RETRY_WITH_OTHER_PEERS));
     Mockito.when(peerTask.getSubProtocol()).thenReturn(subprotocol);
     Mockito.when(requestSender.sendRequest(subprotocol, requestMessageData, ethPeer))
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EOFTestSubCommand.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EOFTestSubCommand.java
index 94f8b2cd49..fb28701f77 100644
--- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EOFTestSubCommand.java
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EOFTestSubCommand.java
@@ -224,7 +224,7 @@ public class EOFTestSubCommand implements Runnable {
       return failed(re.getMessage());
     }
     if (codeBytes.isEmpty()) {
-      return passed();
+      return failed("invalid_magic code is zero-length");
     }
 
     var layout = EOFLayout.parseEOF(codeBytes);
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsConfiguration.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsConfiguration.java
index 4a542fce00..d32823630b 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsConfiguration.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsConfiguration.java
@@ -30,13 +30,17 @@ import com.google.common.base.MoreObjects;
 
 /** The Metrics configuration. */
 public class MetricsConfiguration {
-  private static final String DEFAULT_METRICS_HOST = "127.0.0.1";
+
+  /** The constant DEFAULT_METRICS_HOST. */
+  public static final String DEFAULT_METRICS_HOST = "127.0.0.1";
 
   /** The constant DEFAULT_METRICS_PORT. */
   public static final int DEFAULT_METRICS_PORT = 9545;
 
   private static final MetricsProtocol DEFAULT_METRICS_PROTOCOL = MetricsProtocol.PROMETHEUS;
-  private static final String DEFAULT_METRICS_PUSH_HOST = "127.0.0.1";
+
+  /** The constant DEFAULT_METRICS_PUSH_HOST. */
+  public static final String DEFAULT_METRICS_PUSH_HOST = "127.0.0.1";
 
   /** The constant DEFAULT_METRICS_PUSH_PORT. */
   public static final int DEFAULT_METRICS_PUSH_PORT = 9001;