diff --git a/contracts/gas-snapshots/ccip.gas-snapshot b/contracts/gas-snapshots/ccip.gas-snapshot
index e09516b1d0..158564681b 100644
--- a/contracts/gas-snapshots/ccip.gas-snapshot
+++ b/contracts/gas-snapshots/ccip.gas-snapshot
@@ -56,7 +56,7 @@ BurnMintERC677_burn:testPoolBurnRevertNotHealthyReverts() (gas: 58150)
 BurnMintERC677_burn:testPoolBurnSuccess() (gas: 197641)
 BurnMintERC677_mint:testPoolMintNotHealthyReverts() (gas: 55384)
 BurnMintERC677_mint:testPoolMintSuccess() (gas: 93675)
-CCIPClientExample_sanity:testExamples() (gas: 2220761)
+CCIPClientExample_sanity:testExamples() (gas: 2216216)
 CommitStore_constructor:testConstructorSuccess() (gas: 3307574)
 CommitStore_isUnpausedAndARMHealthy:testARMSuccess() (gas: 71312)
 CommitStore_report:testInvalidIntervalMinLargerThanMaxReverts() (gas: 26019)
@@ -86,73 +86,73 @@ CommitStore_verify:testPausedReverts() (gas: 18438)
 CommitStore_verify:testTooManyLeavesReverts() (gas: 36830)
 DefensiveExampleTest:testHappyPathSuccess() (gas: 174828)
 DefensiveExampleTest:testRecovery() (gas: 399728)
-E2E:testE2E_3MessagesSuccess_gas() (gas: 870710)
+E2E:testE2E_3MessagesSuccess_gas() (gas: 863336)
 EVM2EVMOffRamp__releaseOrMintTokens:testRateLimitErrorsReverts() (gas: 428056)
 EVM2EVMOffRamp__releaseOrMintTokens:testTokenHandlingErrorReverts() (gas: 100322)
 EVM2EVMOffRamp__releaseOrMintTokens:testUnsupportedTokenReverts() (gas: 18159)
 EVM2EVMOffRamp__releaseOrMintTokens:test_releaseOrMintTokensSuccess() (gas: 139008)
-EVM2EVMOffRamp__report:testReportSuccess() (gas: 129025)
-EVM2EVMOffRamp__trialExecute:testRateLimitErrorReverts() (gas: 151693)
-EVM2EVMOffRamp__trialExecute:testTokenHandlingErrorIsCaughtSuccess() (gas: 181117)
-EVM2EVMOffRamp__trialExecute:test_trialExecuteSuccess() (gas: 229193)
+EVM2EVMOffRamp__report:testReportSuccess() (gas: 126666)
+EVM2EVMOffRamp__trialExecute:testRateLimitErrorReverts() (gas: 150522)
+EVM2EVMOffRamp__trialExecute:testTokenHandlingErrorIsCaughtSuccess() (gas: 179946)
+EVM2EVMOffRamp__trialExecute:test_trialExecuteSuccess() (gas: 228022)
 EVM2EVMOffRamp_applyPoolUpdates:testApplyPoolUpdatesSuccess() (gas: 2548304)
 EVM2EVMOffRamp_applyPoolUpdates:testInvalidTokenPoolConfigReverts() (gas: 17359)
 EVM2EVMOffRamp_applyPoolUpdates:testOnlyCallableByOwnerReverts() (gas: 16000)
 EVM2EVMOffRamp_applyPoolUpdates:testPoolAlreadyExistsReverts() (gas: 5153053)
 EVM2EVMOffRamp_applyPoolUpdates:testPoolDoesNotExistReverts() (gas: 2512963)
 EVM2EVMOffRamp_applyPoolUpdates:testTokenPoolMismatchReverts() (gas: 5155382)
-EVM2EVMOffRamp_ccipReceive:testReverts() (gas: 18247)
-EVM2EVMOffRamp_constructor:testCommitStoreAlreadyInUseReverts() (gas: 169286)
-EVM2EVMOffRamp_constructor:testConstructorSuccess() (gas: 6021934)
-EVM2EVMOffRamp_constructor:testTokenConfigMismatchReverts() (gas: 145652)
-EVM2EVMOffRamp_constructor:testZeroOnRampAddressReverts() (gas: 2651936)
-EVM2EVMOffRamp_execute:testAlreadyExecutedReverts() (gas: 139986)
-EVM2EVMOffRamp_execute:testEmptyReportReverts() (gas: 18992)
-EVM2EVMOffRamp_execute:testInvalidMessageIdReverts() (gas: 36234)
-EVM2EVMOffRamp_execute:testInvalidSourceChainReverts() (gas: 52576)
-EVM2EVMOffRamp_execute:testManualExecutionNotYetEnabledReverts() (gas: 46248)
-EVM2EVMOffRamp_execute:testMessageTooLargeReverts() (gas: 153620)
-EVM2EVMOffRamp_execute:testPausedReverts() (gas: 79161)
-EVM2EVMOffRamp_execute:testReceiverErrorSuccess() (gas: 166396)
-EVM2EVMOffRamp_execute:testRootNotCommittedReverts() (gas: 41124)
-EVM2EVMOffRamp_execute:testRouterYULCallReverts() (gas: 416120)
-EVM2EVMOffRamp_execute:testSingleMessageNoTokensSuccess() (gas: 176803)
-EVM2EVMOffRamp_execute:testSingleMessageToNonCCIPReceiverSuccess() (gas: 249382)
-EVM2EVMOffRamp_execute:testSingleMessagesNoTokensSuccess_gas() (gas: 115229)
-EVM2EVMOffRamp_execute:testSkippedIncorrectNonceStillExecutesSuccess() (gas: 320721)
-EVM2EVMOffRamp_execute:testSkippedIncorrectNonceSuccess() (gas: 55129)
-EVM2EVMOffRamp_execute:testStrictUntouchedToSuccessSuccess() (gas: 133621)
-EVM2EVMOffRamp_execute:testTokenDataMismatchReverts() (gas: 51821)
-EVM2EVMOffRamp_execute:testTwoMessagesWithTokensAndGESuccess() (gas: 436040)
-EVM2EVMOffRamp_execute:testTwoMessagesWithTokensSuccess_gas() (gas: 392008)
-EVM2EVMOffRamp_execute:testUnexpectedTokenDataReverts() (gas: 34068)
-EVM2EVMOffRamp_execute:testUnhealthyReverts() (gas: 413627)
-EVM2EVMOffRamp_execute:testUnsupportedNumberOfTokensReverts() (gas: 64495)
-EVM2EVMOffRamp_execute:testUnsupportedTokenReverts() (gas: 136561)
-EVM2EVMOffRamp_executeSingleMessage:testMessageSenderReverts() (gas: 21647)
-EVM2EVMOffRamp_executeSingleMessage:testNoTokensSuccess() (gas: 48821)
-EVM2EVMOffRamp_executeSingleMessage:testNonContractSuccess() (gas: 21195)
-EVM2EVMOffRamp_executeSingleMessage:testNonContractWithTokensSuccess() (gas: 198093)
-EVM2EVMOffRamp_executeSingleMessage:testTokenHandlingErrorReverts() (gas: 138058)
-EVM2EVMOffRamp_executeSingleMessage:testTokensSuccess() (gas: 227809)
-EVM2EVMOffRamp_executeSingleMessage:testZeroGasDONExecutionReverts() (gas: 49344)
-EVM2EVMOffRamp_execute_upgrade:testV2NonceNewSenderStartsAtZeroSuccess() (gas: 235267)
-EVM2EVMOffRamp_execute_upgrade:testV2NonceStartsAtV1NonceSuccess() (gas: 284786)
-EVM2EVMOffRamp_execute_upgrade:testV2OffRampNonceSkipsIfMsgInFlightSuccess() (gas: 267420)
-EVM2EVMOffRamp_execute_upgrade:testV2SenderNoncesReadsPreviousRampSuccess() (gas: 231165)
-EVM2EVMOffRamp_execute_upgrade:testV2Success() (gas: 133015)
+EVM2EVMOffRamp_ccipReceive:testReverts() (gas: 17094)
+EVM2EVMOffRamp_constructor:testCommitStoreAlreadyInUseReverts() (gas: 169257)
+EVM2EVMOffRamp_constructor:testConstructorSuccess() (gas: 6004286)
+EVM2EVMOffRamp_constructor:testTokenConfigMismatchReverts() (gas: 145623)
+EVM2EVMOffRamp_constructor:testZeroOnRampAddressReverts() (gas: 2651907)
+EVM2EVMOffRamp_execute:testAlreadyExecutedReverts() (gas: 136534)
+EVM2EVMOffRamp_execute:testEmptyReportReverts() (gas: 18990)
+EVM2EVMOffRamp_execute:testInvalidMessageIdReverts() (gas: 33939)
+EVM2EVMOffRamp_execute:testInvalidSourceChainReverts() (gas: 49122)
+EVM2EVMOffRamp_execute:testManualExecutionNotYetEnabledReverts() (gas: 43953)
+EVM2EVMOffRamp_execute:testMessageTooLargeReverts() (gas: 149928)
+EVM2EVMOffRamp_execute:testPausedReverts() (gas: 74549)
+EVM2EVMOffRamp_execute:testReceiverErrorSuccess() (gas: 162924)
+EVM2EVMOffRamp_execute:testRootNotCommittedReverts() (gas: 38829)
+EVM2EVMOffRamp_execute:testRouterYULCallReverts() (gas: 412650)
+EVM2EVMOffRamp_execute:testSingleMessageNoTokensSuccess() (gas: 172174)
+EVM2EVMOffRamp_execute:testSingleMessageToNonCCIPReceiverSuccess() (gas: 245912)
+EVM2EVMOffRamp_execute:testSingleMessagesNoTokensSuccess_gas() (gas: 114026)
+EVM2EVMOffRamp_execute:testSkippedIncorrectNonceStillExecutesSuccess() (gas: 314921)
+EVM2EVMOffRamp_execute:testSkippedIncorrectNonceSuccess() (gas: 51676)
+EVM2EVMOffRamp_execute:testStrictUntouchedToSuccessSuccess() (gas: 130151)
+EVM2EVMOffRamp_execute:testTokenDataMismatchReverts() (gas: 49524)
+EVM2EVMOffRamp_execute:testTwoMessagesWithTokensAndGESuccess() (gas: 430223)
+EVM2EVMOffRamp_execute:testTwoMessagesWithTokensSuccess_gas() (gas: 389520)
+EVM2EVMOffRamp_execute:testUnexpectedTokenDataReverts() (gas: 32929)
+EVM2EVMOffRamp_execute:testUnhealthyReverts() (gas: 406629)
+EVM2EVMOffRamp_execute:testUnsupportedNumberOfTokensReverts() (gas: 61032)
+EVM2EVMOffRamp_execute:testUnsupportedTokenReverts() (gas: 129586)
+EVM2EVMOffRamp_executeSingleMessage:testMessageSenderReverts() (gas: 20494)
+EVM2EVMOffRamp_executeSingleMessage:testNoTokensSuccess() (gas: 47668)
+EVM2EVMOffRamp_executeSingleMessage:testNonContractSuccess() (gas: 20042)
+EVM2EVMOffRamp_executeSingleMessage:testNonContractWithTokensSuccess() (gas: 196939)
+EVM2EVMOffRamp_executeSingleMessage:testTokenHandlingErrorReverts() (gas: 136903)
+EVM2EVMOffRamp_executeSingleMessage:testTokensSuccess() (gas: 225488)
+EVM2EVMOffRamp_executeSingleMessage:testZeroGasDONExecutionReverts() (gas: 48191)
+EVM2EVMOffRamp_execute_upgrade:testV2NonceNewSenderStartsAtZeroSuccess() (gas: 230624)
+EVM2EVMOffRamp_execute_upgrade:testV2NonceStartsAtV1NonceSuccess() (gas: 277815)
+EVM2EVMOffRamp_execute_upgrade:testV2OffRampNonceSkipsIfMsgInFlightSuccess() (gas: 259301)
+EVM2EVMOffRamp_execute_upgrade:testV2SenderNoncesReadsPreviousRampSuccess() (gas: 223057)
+EVM2EVMOffRamp_execute_upgrade:testV2Success() (gas: 130696)
 EVM2EVMOffRamp_getDestinationToken:testGetDestinationTokenSuccess() (gas: 32662)
 EVM2EVMOffRamp_getDestinationToken:testUnsupportedTokenReverts() (gas: 13728)
 EVM2EVMOffRamp_getDestinationTokens:testGetDestinationTokensSuccess() (gas: 26043)
 EVM2EVMOffRamp_getExecutionState:testFillExecutionStateSuccess() (gas: 3047472)
 EVM2EVMOffRamp_getExecutionState:test_GetExecutionStateSuccess() (gas: 76287)
-EVM2EVMOffRamp_manuallyExecute:testLowGasLimitManualExecSuccess() (gas: 500322)
-EVM2EVMOffRamp_manuallyExecute:testManualExecForkedChainReverts() (gas: 27057)
-EVM2EVMOffRamp_manuallyExecute:testManualExecGasLimitMismatchReverts() (gas: 44562)
-EVM2EVMOffRamp_manuallyExecute:testManualExecInvalidGasLimitReverts() (gas: 27095)
-EVM2EVMOffRamp_manuallyExecute:testManualExecSuccess() (gas: 193001)
-EVM2EVMOffRamp_manuallyExecute:testManualExecWithGasOverrideSuccess() (gas: 193581)
-EVM2EVMOffRamp_manuallyExecute:testReentrancyManualExecuteFAILS() (gas: 1895103)
+EVM2EVMOffRamp_manuallyExecute:testLowGasLimitManualExecSuccess() (gas: 495679)
+EVM2EVMOffRamp_manuallyExecute:testManualExecForkedChainReverts() (gas: 25902)
+EVM2EVMOffRamp_manuallyExecute:testManualExecGasLimitMismatchReverts() (gas: 43405)
+EVM2EVMOffRamp_manuallyExecute:testManualExecInvalidGasLimitReverts() (gas: 25940)
+EVM2EVMOffRamp_manuallyExecute:testManualExecSuccess() (gas: 188359)
+EVM2EVMOffRamp_manuallyExecute:testManualExecWithGasOverrideSuccess() (gas: 188939)
+EVM2EVMOffRamp_manuallyExecute:testReentrancyManualExecuteFAILS() (gas: 1890571)
 EVM2EVMOffRamp_metadataHash:testMetadataHashSuccess() (gas: 6074)
 EVM2EVMOffRamp_setDynamicConfig:testNonOwnerReverts() (gas: 44264)
 EVM2EVMOffRamp_setDynamicConfig:testRouterZeroAddressReverts() (gas: 38118)
@@ -165,10 +165,10 @@ EVM2EVMOnRamp_applyPoolUpdates:testOnlyCallableByOwnerReverts() (gas: 23154)
 EVM2EVMOnRamp_applyPoolUpdates:testPoolAlreadyExistsReverts() (gas: 351576)
 EVM2EVMOnRamp_applyPoolUpdates:testPoolDoesNotExistReverts() (gas: 277882)
 EVM2EVMOnRamp_applyPoolUpdates:testRemoveTokenPoolMismatchReverts() (gas: 616024)
-EVM2EVMOnRamp_constructor:testConstructorSuccess() (gas: 5767696)
-EVM2EVMOnRamp_forwardFromRouter:testForwardFromRouterSuccess() (gas: 131989)
-EVM2EVMOnRamp_forwardFromRouter:testForwardFromRouterSuccessCustomExtraArgs() (gas: 132301)
-EVM2EVMOnRamp_forwardFromRouter:testForwardFromRouterSuccessLegacyExtraArgs() (gas: 142721)
+EVM2EVMOnRamp_constructor:testConstructorSuccess() (gas: 5751237)
+EVM2EVMOnRamp_forwardFromRouter:testForwardFromRouterSuccess() (gas: 129700)
+EVM2EVMOnRamp_forwardFromRouter:testForwardFromRouterSuccessCustomExtraArgs() (gas: 130012)
+EVM2EVMOnRamp_forwardFromRouter:testForwardFromRouterSuccessLegacyExtraArgs() (gas: 140431)
 EVM2EVMOnRamp_forwardFromRouter:testInvalidAddressEncodePackedReverts() (gas: 23964)
 EVM2EVMOnRamp_forwardFromRouter:testInvalidAddressReverts() (gas: 24263)
 EVM2EVMOnRamp_forwardFromRouter:testInvalidExtraArgsTagReverts() (gas: 23242)
@@ -180,17 +180,17 @@ EVM2EVMOnRamp_forwardFromRouter:testOriginalSenderReverts() (gas: 20187)
 EVM2EVMOnRamp_forwardFromRouter:testPausedReverts() (gas: 49590)
 EVM2EVMOnRamp_forwardFromRouter:testPermissionsReverts() (gas: 26792)
 EVM2EVMOnRamp_forwardFromRouter:testPriceNotFoundForTokenReverts() (gas: 34382)
-EVM2EVMOnRamp_forwardFromRouter:testShouldIncrementSeqNumAndNonceSuccess() (gas: 180487)
-EVM2EVMOnRamp_forwardFromRouter:testShouldStoreLinkFees() (gas: 108580)
-EVM2EVMOnRamp_forwardFromRouter:testShouldStoreNonLinkFees() (gas: 127810)
+EVM2EVMOnRamp_forwardFromRouter:testShouldIncrementSeqNumAndNonceSuccess() (gas: 173601)
+EVM2EVMOnRamp_forwardFromRouter:testShouldStoreLinkFees() (gas: 107444)
+EVM2EVMOnRamp_forwardFromRouter:testShouldStoreNonLinkFees() (gas: 126675)
 EVM2EVMOnRamp_forwardFromRouter:testTooManyTokensReverts() (gas: 28108)
 EVM2EVMOnRamp_forwardFromRouter:testUnhealthyReverts() (gas: 42943)
 EVM2EVMOnRamp_forwardFromRouter:testUnsupportedTokenReverts() (gas: 108788)
 EVM2EVMOnRamp_forwardFromRouter:testZeroAddressReceiverReverts() (gas: 154470)
-EVM2EVMOnRamp_forwardFromRouter_upgrade:testV2NonceNewSenderStartsAtZeroSuccess() (gas: 151462)
-EVM2EVMOnRamp_forwardFromRouter_upgrade:testV2NonceStartsAtV1NonceSuccess() (gas: 197712)
-EVM2EVMOnRamp_forwardFromRouter_upgrade:testV2SenderNoncesReadsPreviousRampSuccess() (gas: 121267)
-EVM2EVMOnRamp_forwardFromRouter_upgrade:testV2Success() (gas: 97564)
+EVM2EVMOnRamp_forwardFromRouter_upgrade:testV2NonceNewSenderStartsAtZeroSuccess() (gas: 148038)
+EVM2EVMOnRamp_forwardFromRouter_upgrade:testV2NonceStartsAtV1NonceSuccess() (gas: 191992)
+EVM2EVMOnRamp_forwardFromRouter_upgrade:testV2SenderNoncesReadsPreviousRampSuccess() (gas: 117859)
+EVM2EVMOnRamp_forwardFromRouter_upgrade:testV2Success() (gas: 95276)
 EVM2EVMOnRamp_getDataAvailabilityCostUSD:testEmptyMessageCalculatesDataAvailabilityCostSuccess() (gas: 15075)
 EVM2EVMOnRamp_getDataAvailabilityCostUSD:testSimpleMessageCalculatesDataAvailabilityCostSuccess() (gas: 15388)
 EVM2EVMOnRamp_getExpectedNextSequenceNumber:testGetExpectedNextSequenceNumberSuccess() (gas: 7860)
@@ -224,7 +224,7 @@ EVM2EVMOnRamp_payNops:testNoFeesToPayReverts() (gas: 131481)
 EVM2EVMOnRamp_payNops:testNoNopsToPayReverts() (gas: 136500)
 EVM2EVMOnRamp_payNops:testNopPayNopsSuccess() (gas: 149589)
 EVM2EVMOnRamp_payNops:testOwnerPayNopsSuccess() (gas: 144225)
-EVM2EVMOnRamp_payNops:testPayNopsSuccessAfterSetNops() (gas: 303562)
+EVM2EVMOnRamp_payNops:testPayNopsSuccessAfterSetNops() (gas: 302426)
 EVM2EVMOnRamp_payNops:testWrongPermissionsReverts() (gas: 19467)
 EVM2EVMOnRamp_setDynamicConfig:testSetConfigInvalidConfigReverts() (gas: 37031)
 EVM2EVMOnRamp_setDynamicConfig:testSetConfigOnlyOwnerReverts() (gas: 25795)
@@ -233,10 +233,10 @@ EVM2EVMOnRamp_setFeeTokenConfig:testOnlyCallableByOwnerOrAdminReverts() (gas: 17
 EVM2EVMOnRamp_setFeeTokenConfig:testSetFeeTokenConfigByAdminSuccess() (gas: 20586)
 EVM2EVMOnRamp_setFeeTokenConfig:testSetFeeTokenConfigSuccess() (gas: 13950)
 EVM2EVMOnRamp_setNops:testAdminCanSetNopsSuccess() (gas: 65220)
-EVM2EVMOnRamp_setNops:testIncludesPaymentSuccess() (gas: 438918)
+EVM2EVMOnRamp_setNops:testIncludesPaymentSuccess() (gas: 437782)
 EVM2EVMOnRamp_setNops:testLinkTokenCannotBeNopReverts() (gas: 57250)
 EVM2EVMOnRamp_setNops:testNonOwnerOrAdminReverts() (gas: 18777)
-EVM2EVMOnRamp_setNops:testNotEnoughFundsForPayoutReverts() (gas: 89943)
+EVM2EVMOnRamp_setNops:testNotEnoughFundsForPayoutReverts() (gas: 88807)
 EVM2EVMOnRamp_setNops:testSetNopsRemovesOldNopsCompletelySuccess() (gas: 63408)
 EVM2EVMOnRamp_setNops:testSetNopsSuccess() (gas: 170843)
 EVM2EVMOnRamp_setNops:testTooManyNopsReverts() (gas: 190362)
@@ -245,9 +245,9 @@ EVM2EVMOnRamp_setTokenTransferFeeConfig:testOnlyCallableByOwnerOrAdminReverts()
 EVM2EVMOnRamp_setTokenTransferFeeConfig:testSetFeeTokenConfigByAdminSuccess() (gas: 20647)
 EVM2EVMOnRamp_setTokenTransferFeeConfig:testSetFeeTokenConfigSuccess() (gas: 50282)
 EVM2EVMOnRamp_withdrawNonLinkFees:testInvalidTokenReverts() (gas: 15094)
-EVM2EVMOnRamp_withdrawNonLinkFees:testLinkBalanceNotSettledReverts() (gas: 88446)
+EVM2EVMOnRamp_withdrawNonLinkFees:testLinkBalanceNotSettledReverts() (gas: 87310)
 EVM2EVMOnRamp_withdrawNonLinkFees:testNonOwnerOrAdminReverts() (gas: 19453)
-EVM2EVMOnRamp_withdrawNonLinkFees:testSettlingBalanceSuccess() (gas: 247963)
+EVM2EVMOnRamp_withdrawNonLinkFees:testSettlingBalanceSuccess() (gas: 247054)
 EVM2EVMOnRamp_withdrawNonLinkFees:testWithdrawNonLinkFeesSuccess() (gas: 50104)
 EVM2EVMOnRamp_withdrawNonLinkFees:testWithdrawToZeroAddressReverts() (gas: 12913)
 LockReleaseTokenPool_addLiquidity:testLiquidityNotAcceptedReverts() (gas: 2509153)
@@ -288,10 +288,10 @@ OCR2Base_transmit:testTransmit2SignersSuccess_gas() (gas: 51741)
 OCR2Base_transmit:testUnAuthorizedTransmitterReverts() (gas: 23441)
 OCR2Base_transmit:testUnauthorizedSignerReverts() (gas: 43661)
 OCR2Base_transmit:testWrongNumberOfSignaturesReverts() (gas: 20507)
-OnRampTokenPoolReentrancy:testSuccess() (gas: 336945)
-PingPong_ccipReceive:testCcipReceiveSuccess() (gas: 150304)
+OnRampTokenPoolReentrancy:testSuccess() (gas: 332357)
+PingPong_ccipReceive:testCcipReceiveSuccess() (gas: 149169)
 PingPong_plumbing:testPausingSuccess() (gas: 14471)
-PingPong_startPingPong:testStartPingPongSuccess() (gas: 176530)
+PingPong_startPingPong:testStartPingPongSuccess() (gas: 174247)
 PriceRegistry_applyFeeTokensUpdates:testApplyFeeTokensUpdatesSuccess() (gas: 77674)
 PriceRegistry_applyFeeTokensUpdates:testOnlyCallableByOwnerReverts() (gas: 16598)
 PriceRegistry_applyPriceUpdatersUpdates:testApplyPriceUpdaterUpdatesSuccess() (gas: 80774)
@@ -331,21 +331,21 @@ Router_applyRampUpdates:testOffRampDisable() (gas: 192139)
 Router_applyRampUpdates:testOffRampMismatchReverts() (gas: 108518)
 Router_applyRampUpdates:testOnRampDisable() (gas: 52147)
 Router_applyRampUpdates:testOnlyOwnerReverts() (gas: 12224)
-Router_ccipSend:testCCIPSendLinkFeeNoTokenSuccess_gas() (gas: 114446)
-Router_ccipSend:testCCIPSendLinkFeeOneTokenSuccess_gas() (gas: 189599)
-Router_ccipSend:testCCIPSendNativeFeeNoTokenSuccess_gas() (gas: 126497)
-Router_ccipSend:testCCIPSendNativeFeeOneTokenSuccess_gas() (gas: 201651)
+Router_ccipSend:testCCIPSendLinkFeeNoTokenSuccess_gas() (gas: 113310)
+Router_ccipSend:testCCIPSendLinkFeeOneTokenSuccess_gas() (gas: 188462)
+Router_ccipSend:testCCIPSendNativeFeeNoTokenSuccess_gas() (gas: 125362)
+Router_ccipSend:testCCIPSendNativeFeeOneTokenSuccess_gas() (gas: 200514)
 Router_ccipSend:testFeeTokenAmountTooLowReverts() (gas: 61367)
 Router_ccipSend:testInvalidMsgValue() (gas: 31860)
 Router_ccipSend:testNativeFeeTokenInsufficientValue() (gas: 64237)
-Router_ccipSend:testNativeFeeTokenOverpaySuccess() (gas: 166131)
-Router_ccipSend:testNativeFeeTokenSuccess() (gas: 165472)
+Router_ccipSend:testNativeFeeTokenOverpaySuccess() (gas: 164996)
+Router_ccipSend:testNativeFeeTokenSuccess() (gas: 164337)
 Router_ccipSend:testNativeFeeTokenZeroValue() (gas: 51217)
-Router_ccipSend:testNonLinkFeeTokenSuccess() (gas: 237673)
+Router_ccipSend:testNonLinkFeeTokenSuccess() (gas: 236538)
 Router_ccipSend:testUnsupportedDestinationChainReverts() (gas: 24624)
 Router_ccipSend:testWhenNotHealthyReverts() (gas: 44650)
-Router_ccipSend:testWrappedNativeFeeTokenSuccess() (gas: 167571)
-Router_ccipSend:testZeroFeeAndGasPriceSuccess() (gas: 233408)
+Router_ccipSend:testWrappedNativeFeeTokenSuccess() (gas: 166436)
+Router_ccipSend:testZeroFeeAndGasPriceSuccess() (gas: 232273)
 Router_constructor:testConstructorSuccess() (gas: 9929)
 Router_getFee:testGetFeeSupportedChainSuccess() (gas: 38866)
 Router_getFee:testUnsupportedDestinationChainReverts() (gas: 17079)
@@ -380,9 +380,9 @@ TokenPool_setOnRampRateLimiterConfig:testOnlyOwnerReverts() (gas: 17999)
 TokenProxy_ccipSend:testCcipSendGasShouldBeZeroReverts() (gas: 17053)
 TokenProxy_ccipSend:testCcipSendInsufficientAllowanceReverts() (gas: 127348)
 TokenProxy_ccipSend:testCcipSendInvalidTokenReverts() (gas: 15839)
-TokenProxy_ccipSend:testCcipSendNativeSuccess() (gas: 230610)
+TokenProxy_ccipSend:testCcipSendNativeSuccess() (gas: 229473)
 TokenProxy_ccipSend:testCcipSendNoDataAllowedReverts() (gas: 16167)
-TokenProxy_ccipSend:testCcipSendSuccess() (gas: 250257)
+TokenProxy_ccipSend:testCcipSendSuccess() (gas: 249348)
 TokenProxy_constructor:testConstructor() (gas: 10651)
 TokenProxy_getFee:testGetFeeGasShouldBeZeroReverts() (gas: 16734)
 TokenProxy_getFee:testGetFeeInvalidTokenReverts() (gas: 12616)
diff --git a/core/gethwrappers/ccip/generation/generated-wrapper-dependency-versions-do-not-edit.txt b/core/gethwrappers/ccip/generation/generated-wrapper-dependency-versions-do-not-edit.txt
index eb4c73fe92..46278bc909 100644
--- a/core/gethwrappers/ccip/generation/generated-wrapper-dependency-versions-do-not-edit.txt
+++ b/core/gethwrappers/ccip/generation/generated-wrapper-dependency-versions-do-not-edit.txt
@@ -5,9 +5,9 @@ burn_mint_token_pool: ../../../contracts/solc/v0.8.19/BurnMintTokenPool.abi ../.
 commit_store: ../../../contracts/solc/v0.8.19/CommitStore.abi ../../../contracts/solc/v0.8.19/CommitStore.bin 7d80f085f8249ef15e0850bf03698806c972125156f3476a1dafca54598f7f4d
 commit_store_helper: ../../../contracts/solc/v0.8.19/CommitStoreHelper.abi ../../../contracts/solc/v0.8.19/CommitStoreHelper.bin 0891a1662bda54db424d12e80a56533cfd9859f7d94a3be147ad3caa46cad072
 custom_token_pool: ../../../contracts/solc/v0.8.19/CustomTokenPool.abi ../../../contracts/solc/v0.8.19/CustomTokenPool.bin 79ab937aa4493bf31fb0e57affd00555aad75205c90268e89674c28ea9e5e48f
-evm_2_evm_offramp: ../../../contracts/solc/v0.8.19/EVM2EVMOffRamp.abi ../../../contracts/solc/v0.8.19/EVM2EVMOffRamp.bin 961730100a969932fc978daef9e2671b83097296fb8c6e6bea72eb02a772ea09
-evm_2_evm_offramp_helper: ../../../contracts/solc/v0.8.19/EVM2EVMOffRampHelper.abi ../../../contracts/solc/v0.8.19/EVM2EVMOffRampHelper.bin f1c84550cfad0faf5c92109a105a4d75260f994d21b5d681a69de681fba0d822
-evm_2_evm_onramp: ../../../contracts/solc/v0.8.19/EVM2EVMOnRamp.abi ../../../contracts/solc/v0.8.19/EVM2EVMOnRamp.bin ef9d29e8ee6a380d64396f69e4612f1c0e1a5f5a1fc6abb5f9b7a545d254eab5
+evm_2_evm_offramp: ../../../contracts/solc/v0.8.19/EVM2EVMOffRamp.abi ../../../contracts/solc/v0.8.19/EVM2EVMOffRamp.bin 911c974dde7053a3ced860d1578ca90bc7eff8545f2a2061a9b1be75284f3596
+evm_2_evm_offramp_helper: ../../../contracts/solc/v0.8.19/EVM2EVMOffRampHelper.abi ../../../contracts/solc/v0.8.19/EVM2EVMOffRampHelper.bin ddd536b27b8c44f632e4f75089f3ad9fc3f4574dad0a4afe39c75e7c67126f56
+evm_2_evm_onramp: ../../../contracts/solc/v0.8.19/EVM2EVMOnRamp.abi ../../../contracts/solc/v0.8.19/EVM2EVMOnRamp.bin c2952fc3af17380141029b5e7b5b6422b54dcbe7b40e7d651d49aa0717c79ce0
 lock_release_token_pool: ../../../contracts/solc/v0.8.19/LockReleaseTokenPool.abi ../../../contracts/solc/v0.8.19/LockReleaseTokenPool.bin 7f7a28f55f9fb63669cd8038a7f99e31431acd6d15ddeeb6a77188eb0bf85d58
 maybe_revert_message_receiver: ../../../contracts/solc/v0.8.19/MaybeRevertMessageReceiver.abi ../../../contracts/solc/v0.8.19/MaybeRevertMessageReceiver.bin aaa90eac8cc555ee4b0fbe57d1fb8d72d6689b29510b238177c97ab9b7979ac5
 mock_arm_contract: ../../../contracts/solc/v0.8.19/MockARM.abi ../../../contracts/solc/v0.8.19/MockARM.bin efcf4cb260a2b6a6e189639f62bb50ab650a135715c1fcd42c92dfa9d04aa0e3