diff --git a/contracts/gas-snapshots/ccip.gas-snapshot b/contracts/gas-snapshots/ccip.gas-snapshot
index 29b9cc5f30..fa70066ecf 100644
--- a/contracts/gas-snapshots/ccip.gas-snapshot
+++ b/contracts/gas-snapshots/ccip.gas-snapshot
@@ -307,15 +307,15 @@ EVM2EVMOffRamp__releaseOrMintTokens:test_releaseOrMintTokens_Success() (gas: 224
 EVM2EVMOffRamp__releaseOrMintTokens:test_releaseOrMintTokens_destDenominatedDecimals_Success() (gas: 334452)
 EVM2EVMOffRamp__report:test_Report_Success() (gas: 128098)
 EVM2EVMOffRamp__trialExecute:test_RateLimitError_Success() (gas: 258002)
-EVM2EVMOffRamp__trialExecute:test_TokenHandlingErrorIsCaught_Success() (gas: 266636)
+EVM2EVMOffRamp__trialExecute:test_TokenHandlingErrorIsCaught_Success() (gas: 266658)
 EVM2EVMOffRamp__trialExecute:test_TokenPoolIsNotAContract_Success() (gas: 349751)
 EVM2EVMOffRamp__trialExecute:test_trialExecute_Success() (gas: 325785)
 EVM2EVMOffRamp_ccipReceive:test_Reverts() (gas: 17009)
-EVM2EVMOffRamp_constructor:test_CommitStoreAlreadyInUse_Revert() (gas: 153389)
+EVM2EVMOffRamp_constructor:test_CommitStoreAlreadyInUse_Revert() (gas: 153411)
 EVM2EVMOffRamp_constructor:test_Constructor_Success() (gas: 5438986)
 EVM2EVMOffRamp_constructor:test_ZeroOnRampAddress_Revert() (gas: 144168)
 EVM2EVMOffRamp_execute:test_EmptyReport_Revert() (gas: 21345)
-EVM2EVMOffRamp_execute:test_InvalidMessageId_Revert() (gas: 36512)
+EVM2EVMOffRamp_execute:test_InvalidMessageId_Revert() (gas: 36468)
 EVM2EVMOffRamp_execute:test_InvalidSourceChain_Revert() (gas: 51697)
 EVM2EVMOffRamp_execute:test_InvalidSourcePoolAddress_Success() (gas: 483802)
 EVM2EVMOffRamp_execute:test_ManualExecutionNotYetEnabled_Revert() (gas: 47719)
@@ -327,16 +327,16 @@ EVM2EVMOffRamp_execute:test_RootNotCommitted_Revert() (gas: 42553)
 EVM2EVMOffRamp_execute:test_SingleMessageNoTokensUnordered_Success() (gas: 160563)
 EVM2EVMOffRamp_execute:test_SingleMessageNoTokens_Success() (gas: 175832)
 EVM2EVMOffRamp_execute:test_SingleMessageToNonCCIPReceiver_Success() (gas: 249259)
-EVM2EVMOffRamp_execute:test_SingleMessagesNoTokensSuccess_gas() (gas: 115685)
+EVM2EVMOffRamp_execute:test_SingleMessagesNoTokensSuccess_gas() (gas: 115640)
 EVM2EVMOffRamp_execute:test_SkippedIncorrectNonceStillExecutes_Success() (gas: 420840)
 EVM2EVMOffRamp_execute:test_SkippedIncorrectNonce_Success() (gas: 54216)
 EVM2EVMOffRamp_execute:test_StrictUntouchedToSuccess_Success() (gas: 132655)
-EVM2EVMOffRamp_execute:test_TokenDataMismatch_Revert() (gas: 52183)
+EVM2EVMOffRamp_execute:test_TokenDataMismatch_Revert() (gas: 52140)
 EVM2EVMOffRamp_execute:test_TwoMessagesWithTokensAndGE_Success() (gas: 585591)
 EVM2EVMOffRamp_execute:test_TwoMessagesWithTokensSuccess_gas() (gas: 518246)
 EVM2EVMOffRamp_execute:test_UnexpectedTokenData_Revert() (gas: 35457)
-EVM2EVMOffRamp_execute:test_Unhealthy_Revert() (gas: 567207)
-EVM2EVMOffRamp_execute:test_UnsupportedNumberOfTokens_Revert() (gas: 64093)
+EVM2EVMOffRamp_execute:test_Unhealthy_Revert() (gas: 567229)
+EVM2EVMOffRamp_execute:test_UnsupportedNumberOfTokens_Revert() (gas: 64115)
 EVM2EVMOffRamp_execute:test__execute_SkippedAlreadyExecutedMessageUnordered_Success() (gas: 123913)
 EVM2EVMOffRamp_execute:test__execute_SkippedAlreadyExecutedMessage_Success() (gas: 144078)
 EVM2EVMOffRamp_execute:test_execute_RouterYULCall_Success() (gas: 428894)
@@ -346,35 +346,37 @@ EVM2EVMOffRamp_executeSingleMessage:test_NonContract_Success() (gas: 20894)
 EVM2EVMOffRamp_executeSingleMessage:test_TokenHandlingError_Revert() (gas: 221807)
 EVM2EVMOffRamp_executeSingleMessage:test_ZeroGasDONExecution_Revert() (gas: 49315)
 EVM2EVMOffRamp_executeSingleMessage:test_executeSingleMessage_NoTokens_Success() (gas: 48783)
-EVM2EVMOffRamp_executeSingleMessage:test_executeSingleMessage_WithTokens_Success() (gas: 327536)
+EVM2EVMOffRamp_executeSingleMessage:test_executeSingleMessage_WithTokens_Success() (gas: 327492)
 EVM2EVMOffRamp_executeSingleMessage:test_executeSingleMessage_ZeroGasZeroData_Success() (gas: 73820)
 EVM2EVMOffRamp_execute_upgrade:test_V2NonceNewSenderStartsAtZero_Success() (gas: 232607)
 EVM2EVMOffRamp_execute_upgrade:test_V2NonceStartsAtV1Nonce_Success() (gas: 281750)
 EVM2EVMOffRamp_execute_upgrade:test_V2OffRampNonceSkipsIfMsgInFlight_Success() (gas: 262355)
 EVM2EVMOffRamp_execute_upgrade:test_V2SenderNoncesReadsPreviousRamp_Success() (gas: 231302)
 EVM2EVMOffRamp_execute_upgrade:test_V2_Success() (gas: 132294)
-EVM2EVMOffRamp_getAllRateLimitTokens:test_GetAllRateLimitTokens_Success() (gas: 38446)
+EVM2EVMOffRamp_getAllRateLimitTokens:test_GetAllRateLimitTokens_Success() (gas: 38468)
 EVM2EVMOffRamp_getExecutionState:test_FillExecutionState_Success() (gas: 3213578)
 EVM2EVMOffRamp_getExecutionState:test_GetExecutionState_Success() (gas: 83091)
-EVM2EVMOffRamp_manuallyExecute:test_LowGasLimitManualExec_Success() (gas: 485980)
-EVM2EVMOffRamp_manuallyExecute:test_ManualExecFailedTx_Revert() (gas: 189173)
-EVM2EVMOffRamp_manuallyExecute:test_ManualExecForkedChain_Revert() (gas: 27188)
-EVM2EVMOffRamp_manuallyExecute:test_ManualExecGasLimitMismatch_Revert() (gas: 45592)
-EVM2EVMOffRamp_manuallyExecute:test_ManualExecInvalidGasLimit_Revert() (gas: 27390)
-EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithGasOverride_Success() (gas: 193068)
-EVM2EVMOffRamp_manuallyExecute:test_ManualExec_Success() (gas: 190609)
+EVM2EVMOffRamp_manuallyExecute:test_LowGasLimitManualExec_Success() (gas: 485958)
+EVM2EVMOffRamp_manuallyExecute:test_ManualExecFailedTx_Revert() (gas: 189195)
+EVM2EVMOffRamp_manuallyExecute:test_ManualExecForkedChain_Revert() (gas: 27233)
+EVM2EVMOffRamp_manuallyExecute:test_ManualExecGasLimitMismatch_Revert() (gas: 45570)
+EVM2EVMOffRamp_manuallyExecute:test_ManualExecInvalidGasLimit_Revert() (gas: 27368)
+EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithGasOverride_Success() (gas: 193046)
+EVM2EVMOffRamp_manuallyExecute:test_ManualExec_Success() (gas: 190587)
 EVM2EVMOffRamp_manuallyExecute:test_ReentrancyManualExecuteFails_Success() (gas: 2326013)
-EVM2EVMOffRamp_manuallyExecute:test_manuallyExecute_DoesNotRevertIfUntouched_Success() (gas: 145852)
+EVM2EVMOffRamp_manuallyExecute:test_manuallyExecute_DoesNotRevertIfUntouched_Success() (gas: 145830)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithDestGasAmountOverride_Failure() (gas: 399324)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithDestGasAmountOverride_Mismatch_Failure() (gas: 396610)
-EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithReceiverExecutionGasOverride_Failure() (gas: 154955)
+EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithReceiverExecutionGasOverride_Failure() (gas: 154933)
+EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithTokenGasOverride_Failure() (gas: 399345)
+EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithTokenGasOverride_Mismatch_Failure() (gas: 396631)
 EVM2EVMOffRamp_metadataHash:test_MetadataHash_Success() (gas: 8860)
-EVM2EVMOffRamp_setDynamicConfig:test_NonOwner_Revert() (gas: 40131)
+EVM2EVMOffRamp_setDynamicConfig:test_NonOwner_Revert() (gas: 40153)
 EVM2EVMOffRamp_setDynamicConfig:test_RouterZeroAddress_Revert() (gas: 38236)
 EVM2EVMOffRamp_setDynamicConfig:test_SetDynamicConfig_Success() (gas: 142064)
 EVM2EVMOffRamp_updateRateLimitTokens:test_updateRateLimitTokens_AddsAndRemoves_Success() (gas: 162613)
 EVM2EVMOffRamp_updateRateLimitTokens:test_updateRateLimitTokens_NonOwner_Revert() (gas: 16779)
-EVM2EVMOffRamp_updateRateLimitTokens:test_updateRateLimitTokens_Success() (gas: 197787)
+EVM2EVMOffRamp_updateRateLimitTokens:test_updateRateLimitTokens_Success() (gas: 197743)
 EVM2EVMOnRamp_constructor:test_Constructor_Success() (gas: 5579769)
 EVM2EVMOnRamp_forwardFromRouter:test_CannotSendZeroTokens_Revert() (gas: 35778)
 EVM2EVMOnRamp_forwardFromRouter:test_EnforceOutOfOrder_Revert() (gas: 98428)