diff --git a/contracts/gas-snapshots/feeds.gas-snapshot b/contracts/gas-snapshots/feeds.gas-snapshot
index b5701e3df09..3aaf609831d 100644
--- a/contracts/gas-snapshots/feeds.gas-snapshot
+++ b/contracts/gas-snapshots/feeds.gas-snapshot
@@ -1,58 +1,58 @@
-AcceptPayeeship:test_EmitsPayeeshipTransferred() (gas: 27046)
-AcceptPayeeship:test_RevertIf_SenderIsNotProposed() (gas: 15265)
-Constructor:test_constructor() (gas: 11815)
+AcceptPayeeship:test_EmitsPayeeshipTransferred() (gas: 27068)
+AcceptPayeeship:test_RevertIf_SenderIsNotProposed() (gas: 15287)
+Constructor:test_constructor() (gas: 30920)
 Description:test_ReturnsCorrectDescription() (gas: 12439)
-GetAnswer:test_ReturnsPrimaryGetAnswer() (gas: 206955)
-GetAnswer:test_ReturnsPrimaryGetAnswerAfterBlock() (gas: 210110)
-GetAnswer:test_ReturnsPrimaryGetAnswerNotAllowed() (gas: 209689)
-GetAnswer:test_ReturnsSecondaryGetAnswer() (gas: 209729)
-GetAnswer:test_ReturnsSecondaryGetAnswerNotAllowed() (gas: 212227)
-GetAnswer:test_ReturnsSecondaryGetAnswerSynced() (gas: 216996)
-GetBilling:test_ReturnsBillingData() (gas: 16726)
-GetBillingAccessController:test_ReturnsBillingAccessController() (gas: 11011)
-GetLinkToken:test_ReturnsLinkToken() (gas: 13081)
-GetRequesterAccessController:test_ReturnsRequesterAccessController() (gas: 13063)
-GetRoundData:test_ReturnsPrimaryGetRoundData() (gas: 209178)
-GetRoundData:test_ReturnsPrimaryGetRoundDataAfterBlock() (gas: 212350)
-GetRoundData:test_ReturnsPrimaryGetRoundDataNotAllowed() (gas: 211813)
-GetRoundData:test_ReturnsSecondaryGetRoundData() (gas: 211979)
-GetRoundData:test_ReturnsSecondaryGetRoundDataNotAllowed() (gas: 214364)
-GetRoundData:test_ReturnsSecondaryGetRoundDataSynced() (gas: 219222)
-GetSyncPrimaryRound:test_returnSecondaryRoundId() (gas: 213744)
-GetSyncPrimaryRound:test_returnSyncFourthRoundId() (gas: 212219)
-GetSyncPrimaryRound:test_returnSyncLatestRoundId() (gas: 210430)
-GetSyncPrimaryRound:test_zeroTransmissions() (gas: 12884)
-GetTimestamp:test_ReturnsPrimaryGetTimestamp() (gas: 207023)
-GetTimestamp:test_ReturnsPrimaryGetTimestampAfterBlock() (gas: 210136)
-GetTimestamp:test_ReturnsPrimaryGetTimestampNotAllowed() (gas: 209712)
-GetTimestamp:test_ReturnsSecondaryGetTimestamp() (gas: 209740)
-GetTimestamp:test_ReturnsSecondaryGetTimestampNotAllowed() (gas: 212248)
-GetTimestamp:test_ReturnsSecondaryGetTimestampSynced() (gas: 217029)
-GetTransmitters:test_ReturnsTransmittersList() (gas: 161077)
-GetValidatorConfig:test_ReturnsValidatorConfig() (gas: 14244)
-LatestAnswer:test_ReturnsLatestPrimaryAnswer() (gas: 209678)
-LatestAnswer:test_ReturnsLatestPrimaryAnswerAfterBlock() (gas: 210031)
-LatestAnswer:test_ReturnsLatestSecondaryAnswer() (gas: 210031)
-LatestAnswer:test_ReturnsPreviousPrimaryAnswer() (gas: 209798)
-LatestAnswer:test_ReturnsSyncedAnswer() (gas: 215813)
-LatestConfigDetails:test_ReturnsConfigDetails() (gas: 191094)
-LatestConfigDigestAndEpoch:test_ReturnsLatestConfigDigestAndEpoch() (gas: 191064)
-LatestRound:test_ReturnsLatestPrimaryRoundId() (gas: 209506)
-LatestRound:test_ReturnsLatestPrimaryRoundIdAfterBlock() (gas: 209905)
-LatestRound:test_ReturnsLatestSecondaryRoundId() (gas: 209902)
-LatestRound:test_ReturnsPreviousPrimaryRoundId() (gas: 209649)
-LatestRound:test_ReturnsSyncedRoundId() (gas: 215642)
-LatestRoundData:test_ReturnsLatestPrimaryRoundData() (gas: 211852)
-LatestRoundData:test_ReturnsLatestPrimaryRoundDataAfterBlock() (gas: 212192)
-LatestRoundData:test_ReturnsLatestSecondaryRoundData() (gas: 212256)
-LatestRoundData:test_ReturnsPreviousPrimaryRoundData() (gas: 211974)
-LatestRoundData:test_ReturnsSyncedRoundData() (gas: 218027)
-LatestTimestamp:test_ReturnsLatestPrimaryTimestamp() (gas: 209687)
-LatestTimestamp:test_ReturnsLatestPrimaryTimestampAfterBlock() (gas: 210063)
-LatestTimestamp:test_ReturnsLatestSecondaryTimestamp() (gas: 210106)
-LatestTimestamp:test_ReturnsPreviousPrimaryTimestamp() (gas: 209809)
-LatestTimestamp:test_ReturnsSyncedTimestamp() (gas: 215887)
-LatestTransmissionDetails:test_ReturnsLatestTransmissionDetails() (gas: 17646)
+GetAnswer:test_ReturnsPrimaryGetAnswer() (gas: 163009)
+GetAnswer:test_ReturnsPrimaryGetAnswerAfterBlock() (gas: 166164)
+GetAnswer:test_ReturnsPrimaryGetAnswerNotAllowed() (gas: 165743)
+GetAnswer:test_ReturnsSecondaryGetAnswer() (gas: 165519)
+GetAnswer:test_ReturnsSecondaryGetAnswerNotAllowed() (gas: 168281)
+GetAnswer:test_ReturnsSecondaryGetAnswerSynced() (gas: 172477)
+GetBilling:test_ReturnsBillingData() (gas: 16704)
+GetBillingAccessController:test_ReturnsBillingAccessController() (gas: 11033)
+GetLinkToken:test_ReturnsLinkToken() (gas: 13131)
+GetRequesterAccessController:test_ReturnsRequesterAccessController() (gas: 18435)
+GetRoundData:test_ReturnsPrimaryGetRoundData() (gas: 165177)
+GetRoundData:test_ReturnsPrimaryGetRoundDataAfterBlock() (gas: 168371)
+GetRoundData:test_ReturnsPrimaryGetRoundDataNotAllowed() (gas: 167812)
+GetRoundData:test_ReturnsSecondaryGetRoundData() (gas: 167714)
+GetRoundData:test_ReturnsSecondaryGetRoundDataNotAllowed() (gas: 170341)
+GetRoundData:test_ReturnsSecondaryGetRoundDataSynced() (gas: 174671)
+GetSyncPrimaryRound:test_returnSecondaryRoundId() (gas: 169199)
+GetSyncPrimaryRound:test_returnSyncFourthRoundId() (gas: 167846)
+GetSyncPrimaryRound:test_returnSyncLatestRoundId() (gas: 166309)
+GetSyncPrimaryRound:test_zeroTransmissions() (gas: 12898)
+GetTimestamp:test_ReturnsPrimaryGetTimestamp() (gas: 162966)
+GetTimestamp:test_ReturnsPrimaryGetTimestampAfterBlock() (gas: 166100)
+GetTimestamp:test_ReturnsPrimaryGetTimestampNotAllowed() (gas: 165699)
+GetTimestamp:test_ReturnsSecondaryGetTimestamp() (gas: 165463)
+GetTimestamp:test_ReturnsSecondaryGetTimestampNotAllowed() (gas: 168235)
+GetTimestamp:test_ReturnsSecondaryGetTimestampSynced() (gas: 172466)
+GetTransmitters:test_ReturnsTransmittersList() (gas: 161033)
+GetValidatorConfig:test_ReturnsValidatorConfig() (gas: 37637)
+LatestAnswer:test_ReturnsLatestPrimaryAnswer() (gas: 165707)
+LatestAnswer:test_ReturnsLatestPrimaryAnswerAfterBlock() (gas: 166093)
+LatestAnswer:test_ReturnsLatestSecondaryAnswer() (gas: 166093)
+LatestAnswer:test_ReturnsPreviousPrimaryAnswer() (gas: 165872)
+LatestAnswer:test_ReturnsSyncedAnswer() (gas: 171457)
+LatestConfigDetails:test_ReturnsConfigDetails() (gas: 16815)
+LatestConfigDigestAndEpoch:test_ReturnsLatestConfigDigestAndEpoch() (gas: 186558)
+LatestRound:test_ReturnsLatestPrimaryRoundId() (gas: 165493)
+LatestRound:test_ReturnsLatestPrimaryRoundIdAfterBlock() (gas: 165880)
+LatestRound:test_ReturnsLatestSecondaryRoundId() (gas: 165877)
+LatestRound:test_ReturnsPreviousPrimaryRoundId() (gas: 165636)
+LatestRound:test_ReturnsSyncedRoundId() (gas: 171199)
+LatestRoundData:test_ReturnsLatestPrimaryRoundData() (gas: 167873)
+LatestRoundData:test_ReturnsLatestPrimaryRoundDataAfterBlock() (gas: 168213)
+LatestRoundData:test_ReturnsLatestSecondaryRoundData() (gas: 168277)
+LatestRoundData:test_ReturnsPreviousPrimaryRoundData() (gas: 168038)
+LatestRoundData:test_ReturnsSyncedRoundData() (gas: 173641)
+LatestTimestamp:test_ReturnsLatestPrimaryTimestamp() (gas: 165674)
+LatestTimestamp:test_ReturnsLatestPrimaryTimestampAfterBlock() (gas: 166038)
+LatestTimestamp:test_ReturnsLatestSecondaryTimestamp() (gas: 166081)
+LatestTimestamp:test_ReturnsPreviousPrimaryTimestamp() (gas: 165796)
+LatestTimestamp:test_ReturnsSyncedTimestamp() (gas: 171444)
+LatestTransmissionDetails:test_ReturnsLatestTransmissionDetails() (gas: 19740)
 LatestTransmissionDetails:test_RevertIf_NotEOA() (gas: 8558)
 LinkAvailableForPayment:test_ReturnsBalanceWhenNothingDue() (gas: 40404)
 LinkAvailableForPayment:test_ReturnsRemainingBalanceWhenHasDues() (gas: 164)
@@ -60,50 +60,61 @@ OracleObservationCount:test_ReturnsCorrectObservationCount() (gas: 164)
 OracleObservationCount:test_ReturnsZeroWhenNoObservations() (gas: 20040)
 OwedPayment:test_ReturnOwedAmount() (gas: 20440)
 OwedPayment:test_ReturnZeroIfTransmitterNotActive() (gas: 20441)
-SetBilling:test_EmitsBillingSet() (gas: 56804)
-SetBilling:test_RevertIf_NotOwner() (gas: 15214)
-SetBillingAccessController:test_EmitsBillingAccessControllerSet() (gas: 22756)
-SetConfig:test_HappyPath() (gas: 3048461)
+RequestNewRound:test_RevertIf_NotRequester() (gas: 15094)
+RequestNewRound:test_ShouldRequestNewRound() (gas: 34290)
+SetBilling:test_EmitsBillingSet() (gas: 56836)
+SetBilling:test_RevertIf_NotOwner() (gas: 15279)
+SetBillingAccessController:test_EmitsBillingAccessControllerSet() (gas: 22778)
 SetConfig:test_RevertIf_OracleLengthMismatch() (gas: 27450)
 SetConfig:test_RevertIf_RepeatedSigner() (gas: 120296)
 SetConfig:test_RevertIf_RepeatedTransmitter() (gas: 143058)
-SetConfig:test_RevertIf_SignersTooLong() (gas: 27852)
+SetConfig:test_RevertIf_SignersTooLong() (gas: 27874)
 SetConfig:test_RevertIf_fNotPositive() (gas: 14430)
 SetConfig:test_RevertIf_fTooHigh() (gas: 14265)
 SetConfig:test_RevertIf_onchainConfigInvalid() (gas: 27927)
-SetLinkToken:test_EmitsLinkTokenSet() (gas: 227728)
-SetPayees:test_EmitsPayeeshipTransferred() (gas: 328494)
-SetRequesterAccessController:test_EmitsRequesterAccessControllerSet() (gas: 22675)
-SetValidatorConfig:test_EmitsValidatorConfigSet() (gas: 41602)
+SetConfig:test_SetsTheConfigAndEmitsEvent() (gas: 3103066)
+SetConfig:test_ShouldBeAbleToRemoveSigners() (gas: 3641924)
+SetLinkToken:test_EmitsLinkTokenSet() (gas: 227769)
+SetPayees:test_EmitsPayeeshipTransferred() (gas: 1005423)
+SetRequesterAccessController:test_EmitsRequesterAccessControllerSet() (gas: 18362)
+SetValidatorConfig:test_EmitsValidatorConfigSet() (gas: 37293)
 TransferPayeeship:test_EmitsPayeeshipTransferredRequested() (gas: 46313)
 TransferPayeeship:test_RevertIf_SenderIsProposed() (gas: 19978)
 TransferPayeeship:test_RevertIf_SenderNotCurrentPayee() (gas: 10713)
-Transmit:test_BothFeedsStalledIncomingPrimaryReportIsFromBeforeCutoffTime() (gas: 421798)
-Transmit:test_BothFeedsStalledIncomingReportIsFromAfterCutoffTime() (gas: 421290)
-Transmit:test_BothFeedsStalledIncomingSecondaryReportIsFromBeforeCutoffTime() (gas: 465809)
-Transmit:test_IncomingSecondaryReportHasNotBeenRecordedOlderThanLatestReportNewerThanCutoffTime() (gas: 514430)
-Transmit:test_IncomingSecondaryReportHasNotBeenRecordedOlderThanLatestReportOlderThanCutoffTime() (gas: 524754)
-Transmit:test_IncomingSecondaryReportRevertsDueToMaxIterations() (gas: 811371)
-Transmit:test_OutOfSyncFeedsPrimaryIsSourcedFromSecondaryWithLockDelay() (gas: 420967)
-Transmit:test_OutOfSyncFeedsSecondaryFeedFallbackToStandardFeed() (gas: 813559)
-Transmit:test_ReadExpectedInitialState() (gas: 146843)
-Transmit:test_RevertIf_CalldataLengthMismatch() (gas: 23346)
-Transmit:test_RevertIf_ConfigDigestMismatch() (gas: 20943)
-Transmit:test_RevertIf_DuplicateSigner() (gas: 83078)
-Transmit:test_RevertIf_SendTheSameReportAlternateFirstPrimaryFeed() (gas: 370986)
-Transmit:test_RevertIf_SendTheSameReportAlternateFirstSecondaryFeed() (gas: 368526)
-Transmit:test_RevertIf_SendTheSameReportTwiceToThePrimaryFeed() (gas: 278088)
-Transmit:test_RevertIf_SendTheSameReportTwiceToTheSecondaryFeed() (gas: 281419)
-Transmit:test_RevertIf_SignatureError() (gas: 79780)
-Transmit:test_RevertIf_SignaturesOutOfRegistration() (gas: 25147)
-Transmit:test_RevertIf_UnauthorizedTransmitter() (gas: 14158)
-Transmit:test_RevertIf_WrongNumberOfSignatures() (gas: 25004)
-Transmit:test_SyncFeedsTransmitSecondaryFirstAlwaysSameBlock() (gas: 488893)
-Transmit:test_SyncFeedsTransmitSecondaryFirstNeverSameBlock() (gas: 489861)
-Transmit:test_SyncFeedsTransmitStandardFirstAlwaysSameBlock() (gas: 489823)
-Transmit:test_SyncFeedsTransmitStandardFirstNeverSameBlock() (gas: 532533)
-TypeAndVersion:test_IsCorrect() (gas: 10108)
-WithdrawFunds:test_RevertIf_InsufficientFunds() (gas: 191227)
-WithdrawFunds:test_RevertIf_NotOwner() (gas: 14829)
+Transmit:test_BothFeedsStalledIncomingPrimaryReportIsFromBeforeCutoffTime() (gas: 420630)
+Transmit:test_BothFeedsStalledIncomingReportIsFromAfterCutoffTime() (gas: 420166)
+Transmit:test_BothFeedsStalledIncomingSecondaryReportIsFromBeforeCutoffTime() (gas: 465131)
+Transmit:test_IncomingSecondaryReportHasNotBeenRecordedOlderThanLatestReportNewerThanCutoffTime() (gas: 511883)
+Transmit:test_IncomingSecondaryReportHasNotBeenRecordedOlderThanLatestReportOlderThanCutoffTime() (gas: 520986)
+Transmit:test_IncomingSecondaryReportRevertsDueToMaxIterations() (gas: 806380)
+Transmit:test_OutOfSyncFeedsPrimaryIsSourcedFromSecondaryWithLockDelay() (gas: 420722)
+Transmit:test_OutOfSyncFeedsSecondaryFeedFallbackToStandardFeed() (gas: 810613)
+Transmit:test_ReadExpectedInitialState() (gas: 146990)
+Transmit:test_RevertIf_CalldataLengthMismatch() (gas: 23391)
+Transmit:test_RevertIf_ConfigDigestMismatch() (gas: 20932)
+Transmit:test_RevertIf_DuplicateSigner() (gas: 83230)
+Transmit:test_RevertIf_MedianIsOutOfMinMaxRange() (gas: 159659)
+Transmit:test_RevertIf_NumObservationsOutOfBounds() (gas: 97900)
+Transmit:test_RevertIf_ReportLengthMismatch() (gas: 90900)
+Transmit:test_RevertIf_SendTheSameReportAlternateFirstPrimaryFeed() (gas: 365939)
+Transmit:test_RevertIf_SendTheSameReportAlternateFirstSecondaryFeed() (gas: 363743)
+Transmit:test_RevertIf_SendTheSameReportTwiceToThePrimaryFeed() (gas: 275529)
+Transmit:test_RevertIf_SendTheSameReportTwiceToTheSecondaryFeed() (gas: 279080)
+Transmit:test_RevertIf_SignatureError() (gas: 79943)
+Transmit:test_RevertIf_SignaturesOutOfRegistration() (gas: 25163)
+Transmit:test_RevertIf_TooFewValuesToTrustMedian() (gas: 72143)
+Transmit:test_RevertIf_UnauthorizedTransmitter() (gas: 14180)
+Transmit:test_RevertIf_WrongNumberOfSignatures() (gas: 25024)
+Transmit:test_SyncFeedsTransmitSecondaryFirstAlwaysSameBlock() (gas: 488281)
+Transmit:test_SyncFeedsTransmitSecondaryFirstNeverSameBlock() (gas: 489249)
+Transmit:test_SyncFeedsTransmitStandardFirstAlwaysSameBlock() (gas: 489123)
+Transmit:test_SyncFeedsTransmitStandardFirstNeverSameBlock() (gas: 531537)
+TypeAndVersion:test_IsCorrect() (gas: 10130)
+ValidateAnswer:test_RevertIf_InsufficientGas() (gas: 332116)
+ValidateAnswer:test_ValidateWithContractAddress() (gas: 376760)
+ValidateAnswer:test_ValidateWithZeroAddressContract() (gas: 247172)
+WithdrawFunds:test_RevertIf_InsufficientBalance() (gas: 340375)
+WithdrawFunds:test_RevertIf_InsufficientFunds() (gas: 191296)
+WithdrawFunds:test_RevertIf_NotOwner() (gas: 14903)
 WithdrawPayment:test_PaysOracles() (gas: 165)
-WithdrawPayment:test_RevertIf_NotPayee() (gas: 10572)
\ No newline at end of file
+WithdrawPayment:test_RevertIf_NotPayee() (gas: 10571)
\ No newline at end of file