diff --git a/contracts/.solhintignore b/contracts/.solhintignore
index ba2aac1fb3a..569c8c51df3 100644
--- a/contracts/.solhintignore
+++ b/contracts/.solhintignore
@@ -1,6 +1,14 @@
 # 344 warnings
 #./src/v0.8/automation
 
+# Ignore frozen Automation code
+./src/v0.8/automation/v1_2
+./src/v0.8/automation/v1_3
+./src/v0.8/automation/v2_0
+./src/v0.8/automation/v2_1
+./src/v0.8/automation/mocks
+./src/v0.8/automation/testhelpers
+
 # Ignore Functions v1.0.0 code that was frozen after audit
 ./src/v0.8/functions/v1_0_0
 
diff --git a/contracts/package.json b/contracts/package.json
index 1503c822ea4..2604a12bea3 100644
--- a/contracts/package.json
+++ b/contracts/package.json
@@ -18,7 +18,7 @@
     "prepublishOnly": "pnpm compile && ./scripts/prepublish_generate_abi_folder",
     "publish-beta": "pnpm publish --tag beta",
     "publish-prod": "npm dist-tag add @chainlink/contracts@0.8.0 latest",
-    "solhint": "solhint --max-warnings 376 \"./src/v0.8/**/*.sol\""
+    "solhint": "solhint --max-warnings 83 \"./src/v0.8/**/*.sol\""
   },
   "files": [
     "src/v0.8",
diff --git a/contracts/src/v0.8/ChainlinkClient.sol b/contracts/src/v0.8/ChainlinkClient.sol
index 2d9302faef7..ef7f7943452 100644
--- a/contracts/src/v0.8/ChainlinkClient.sol
+++ b/contracts/src/v0.8/ChainlinkClient.sol
@@ -171,6 +171,7 @@ abstract contract ChainlinkClient {
     s_pendingRequests[requestId] = oracleAddress;
     emit ChainlinkRequested(requestId);
     require(s_link.transferAndCall(oracleAddress, payment, encodedRequest), "unable to transferAndCall to oracle");
+    return requestId;
   }
 
   /**
diff --git a/contracts/src/v0.8/ValidatorProxy.sol b/contracts/src/v0.8/ValidatorProxy.sol
index 627af73b395..4584bb02559 100644
--- a/contracts/src/v0.8/ValidatorProxy.sol
+++ b/contracts/src/v0.8/ValidatorProxy.sol
@@ -167,6 +167,7 @@ contract ValidatorProxy is AggregatorValidatorInterface, TypeAndVersionInterface
     current = s_currentAggregator.target;
     hasProposal = s_currentAggregator.hasNewProposal;
     proposed = s_proposedAggregator;
+    return (current, hasProposal, proposed);
   }
 
   /** VALIDATOR CONFIGURATION FUNCTIONS **/
@@ -216,6 +217,7 @@ contract ValidatorProxy is AggregatorValidatorInterface, TypeAndVersionInterface
     current = s_currentValidator.target;
     hasProposal = s_currentValidator.hasNewProposal;
     proposed = s_proposedValidator;
+    return (current, hasProposal, proposed);
   }
 
   /**
diff --git a/contracts/src/v0.8/automation/libraries/internal/Cron.sol b/contracts/src/v0.8/automation/libraries/internal/Cron.sol
index fe72c412b60..ae4f90d0d71 100644
--- a/contracts/src/v0.8/automation/libraries/internal/Cron.sol
+++ b/contracts/src/v0.8/automation/libraries/internal/Cron.sol
@@ -84,6 +84,7 @@ struct Field {
  * abstraction called a Spec. The library also includes a spec function, nextTick(), which
  * determines the next time a cron job should fire based on the current block timestamp.
  */
+// solhint-disable chainlink-solidity/prefix-internal-functions-with-underscore, no-global-import
 library Cron {
   using strings for *;
 
diff --git a/contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumSequencerUptimeFeed.sol b/contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumSequencerUptimeFeed.sol
index 5250fbda278..63952ab7ba6 100644
--- a/contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumSequencerUptimeFeed.sol
+++ b/contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumSequencerUptimeFeed.sol
@@ -287,6 +287,8 @@ contract ArbitrumSequencerUptimeFeed is
     roundId = _roundId;
     updatedAt = startedAt;
     answeredInRound = roundId;
+
+    return (roundId, answer, startedAt, updatedAt, answeredInRound);
   }
 
   /// @inheritdoc AggregatorV3Interface
@@ -305,5 +307,7 @@ contract ArbitrumSequencerUptimeFeed is
     startedAt = feedState.latestTimestamp;
     updatedAt = startedAt;
     answeredInRound = roundId;
+
+    return (roundId, answer, startedAt, updatedAt, answeredInRound);
   }
 }
diff --git a/contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumValidator.sol b/contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumValidator.sol
index 2043ffa6287..66fee5053ee 100644
--- a/contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumValidator.sol
+++ b/contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumValidator.sol
@@ -204,6 +204,8 @@ contract ArbitrumValidator is TypeAndVersionInterface, AggregatorValidatorInterf
       message
     );
     emit L2WithdrawalRequested(id, amount, refundAddr);
+
+    return id;
   }
 
   /**
diff --git a/contracts/src/v0.8/l2ep/dev/optimism/OptimismSequencerUptimeFeed.sol b/contracts/src/v0.8/l2ep/dev/optimism/OptimismSequencerUptimeFeed.sol
index fcf6093e3cd..947b1b0bf5d 100644
--- a/contracts/src/v0.8/l2ep/dev/optimism/OptimismSequencerUptimeFeed.sol
+++ b/contracts/src/v0.8/l2ep/dev/optimism/OptimismSequencerUptimeFeed.sol
@@ -245,6 +245,7 @@ contract OptimismSequencerUptimeFeed is
     } else {
       revert NoDataPresent();
     }
+    return (roundId, answer, startedAt, updatedAt, answeredInRound);
   }
 
   /// @inheritdoc AggregatorV3Interface
@@ -262,5 +263,6 @@ contract OptimismSequencerUptimeFeed is
     startedAt = feedState.startedAt;
     updatedAt = feedState.updatedAt;
     answeredInRound = roundId;
+    return (roundId, answer, startedAt, updatedAt, answeredInRound);
   }
 }
diff --git a/contracts/src/v0.8/llo-feeds/libraries/ByteUtil.sol b/contracts/src/v0.8/llo-feeds/libraries/ByteUtil.sol
index 9691cfb7fea..53f79b6dc42 100644
--- a/contracts/src/v0.8/llo-feeds/libraries/ByteUtil.sol
+++ b/contracts/src/v0.8/llo-feeds/libraries/ByteUtil.sol
@@ -16,6 +16,7 @@ library ByteUtil {
    * @param offset Position to start reading from.
    * @return result The uint256 read from the byte array.
    */
+  // solhint-disable-next-line chainlink-solidity/explicit-returns
   function _readUint256(bytes memory data, uint256 offset) internal pure returns (uint256 result) {
     //bounds check
     if (offset + 32 > data.length) revert MalformedData();
@@ -32,6 +33,7 @@ library ByteUtil {
    * @param offset Position to start reading from.
    * @return result The uint192 read from the byte array.
    */
+  // solhint-disable-next-line chainlink-solidity/explicit-returns
   function _readUint192(bytes memory data, uint256 offset) internal pure returns (uint256 result) {
     //bounds check
     if (offset + 24 > data.length) revert MalformedData();
@@ -50,6 +52,7 @@ library ByteUtil {
    * @param offset Position to start reading from.
    * @return result The uint32 read from the byte array.
    */
+  // solhint-disable-next-line chainlink-solidity/explicit-returns
   function _readUint32(bytes memory data, uint256 offset) internal pure returns (uint256 result) {
     //bounds check
     if (offset + 4 > data.length) revert MalformedData();
@@ -68,6 +71,7 @@ library ByteUtil {
    * @param offset Position to start reading from.
    * @return result The uint32 read from the byte array.
    */
+  // solhint-disable-next-line chainlink-solidity/explicit-returns
   function _readAddress(bytes memory data, uint256 offset) internal pure returns (address result) {
     //bounds check
     if (offset + 20 > data.length) revert MalformedData();
diff --git a/contracts/src/v0.8/transmission/dev/ERC-4337/Paymaster.sol b/contracts/src/v0.8/transmission/dev/ERC-4337/Paymaster.sol
index 970ddf6b7e6..38b6fb57983 100644
--- a/contracts/src/v0.8/transmission/dev/ERC-4337/Paymaster.sol
+++ b/contracts/src/v0.8/transmission/dev/ERC-4337/Paymaster.sol
@@ -103,6 +103,7 @@ contract Paymaster is IPaymaster, ConfirmedOwner {
         extraCost = directFundingData.topupAmount;
       }
     }
+    return extraCost;
   }
 
   /// @dev Deducts user subscription balance after execution.
@@ -116,6 +117,7 @@ contract Paymaster is IPaymaster, ConfirmedOwner {
 
   function _getCostJuels(uint256 costWei) internal view returns (uint256 costJuels) {
     costJuels = (1e18 * costWei) / uint256(_getFeedData());
+    return costJuels;
   }
 
   function _getFeedData() internal view returns (int256) {
diff --git a/contracts/src/v0.8/transmission/dev/ERC-4337/SCALibrary.sol b/contracts/src/v0.8/transmission/dev/ERC-4337/SCALibrary.sol
index 47587e278f4..35d666a2d3d 100644
--- a/contracts/src/v0.8/transmission/dev/ERC-4337/SCALibrary.sol
+++ b/contracts/src/v0.8/transmission/dev/ERC-4337/SCALibrary.sol
@@ -31,6 +31,7 @@ library SCALibrary {
         hashOfEncoding
       )
     );
+    return fullHash;
   }
 
   function _recoverSignature(bytes memory signature, bytes32 fullHash) internal pure returns (address) {
diff --git a/contracts/src/v0.8/transmission/dev/ERC-4337/SmartContractAccountFactory.sol b/contracts/src/v0.8/transmission/dev/ERC-4337/SmartContractAccountFactory.sol
index 35719345ecd..bb0f2dbde63 100644
--- a/contracts/src/v0.8/transmission/dev/ERC-4337/SmartContractAccountFactory.sol
+++ b/contracts/src/v0.8/transmission/dev/ERC-4337/SmartContractAccountFactory.sol
@@ -27,5 +27,7 @@ contract SmartContractAccountFactory {
     }
 
     emit ContractCreated(scaAddress);
+
+    return scaAddress;
   }
 }
diff --git a/contracts/src/v0.8/transmission/dev/testhelpers/SmartContractAccountHelper.sol b/contracts/src/v0.8/transmission/dev/testhelpers/SmartContractAccountHelper.sol
index c33df49d16b..014f296f077 100644
--- a/contracts/src/v0.8/transmission/dev/testhelpers/SmartContractAccountHelper.sol
+++ b/contracts/src/v0.8/transmission/dev/testhelpers/SmartContractAccountHelper.sol
@@ -18,6 +18,7 @@ library SmartContractAccountHelper {
       SCA.executeTransactionFromEntryPoint.selector,
       abi.encode(endContract, value, block.timestamp + deadline, data)
     );
+    return encoding;
   }
 
   function getFullHashForSigning(bytes32 userOpHash, address scaAddress) public view returns (bytes32) {
@@ -29,6 +30,7 @@ library SmartContractAccountHelper {
     address entryPoint
   ) public pure returns (bytes memory initCode) {
     initCode = bytes.concat(INITIALIZE_CODE, abi.encode(owner, entryPoint));
+    return initCode;
   }
 
   function getInitCode(
@@ -46,6 +48,7 @@ library SmartContractAccountHelper {
         initializeCodeWithConstructor
       )
     );
+    return initCode;
   }
 
   /// @dev Computes the smart contract address that results from a CREATE2 operation, per EIP-1014.
diff --git a/contracts/src/v0.8/vrf/KeepersVRFConsumer.sol b/contracts/src/v0.8/vrf/KeepersVRFConsumer.sol
index a18c6e03798..20fd806b0cc 100644
--- a/contracts/src/v0.8/vrf/KeepersVRFConsumer.sol
+++ b/contracts/src/v0.8/vrf/KeepersVRFConsumer.sol
@@ -61,6 +61,7 @@ contract KeepersVRFConsumer is KeeperCompatibleInterface, VRFConsumerBaseV2 {
    * @return upkeepNeeded true if and only if at least UPKEEP_INTERVAL seconds have elapsed since the last upkeep or since construction
    * of the contract.
    */
+  // solhint-disable-next-line chainlink-solidity/explicit-returns
   function checkUpkeep(
     bytes calldata /* checkData */
   ) external view override returns (bool upkeepNeeded, bytes memory /* performData */) {
diff --git a/contracts/src/v0.8/vrf/VRF.sol b/contracts/src/v0.8/vrf/VRF.sol
index a19fc39ec3e..f7d62a272bc 100644
--- a/contracts/src/v0.8/vrf/VRF.sol
+++ b/contracts/src/v0.8/vrf/VRF.sol
@@ -205,6 +205,7 @@ contract VRF {
     while (x_ >= FIELD_SIZE) {
       x_ = uint256(keccak256(abi.encodePacked(x_)));
     }
+    return x_;
   }
 
   // Hash b to a random point which hopefully lies on secp256k1. The y ordinate
@@ -223,6 +224,7 @@ contract VRF {
         p[1] = FIELD_SIZE - p[1];
       }
     }
+    return p;
   }
 
   // Domain-separation tag for initial hash in _hashToCurve. Corresponds to
@@ -248,6 +250,7 @@ contract VRF {
     while (!_isOnCurve(rv)) {
       rv = _newCandidateSecp256k1Point(abi.encodePacked(rv[0]));
     }
+    return rv;
   }
 
   /** *********************************************************************
@@ -294,6 +297,7 @@ contract VRF {
       uint256 num2 = mulmod(FIELD_SIZE - x2, z1, FIELD_SIZE);
       (x3, z3) = (addmod(num1, num2, FIELD_SIZE), mulmod(z1, z2, FIELD_SIZE));
     }
+    return (x3, z3);
   }
 
   // Returns x1/z1*x2/z2=(x1x2)/(z1z2), in projective coordinates on P¹(𝔽ₙ)
@@ -304,6 +308,7 @@ contract VRF {
     uint256 z2
   ) internal pure returns (uint256 x3, uint256 z3) {
     (x3, z3) = (mulmod(x1, x2, FIELD_SIZE), mulmod(z1, z2, FIELD_SIZE));
+    return (x3, z3);
   }
 
   /** **************************************************************************
@@ -385,6 +390,7 @@ contract VRF {
         sz = dx;
       }
     }
+    return (sx, sy, sz);
   }
 
   // p1+p2, as affine points on secp256k1.
@@ -577,5 +583,6 @@ contract VRF {
       proof.zInv
     );
     output = uint256(keccak256(abi.encode(VRF_RANDOM_OUTPUT_HASH_PREFIX, proof.gamma)));
+    return output;
   }
 }
diff --git a/contracts/src/v0.8/vrf/VRFCoordinatorV2.sol b/contracts/src/v0.8/vrf/VRFCoordinatorV2.sol
index 5acd3e74358..5dfb51a4b13 100644
--- a/contracts/src/v0.8/vrf/VRFCoordinatorV2.sol
+++ b/contracts/src/v0.8/vrf/VRFCoordinatorV2.sol
@@ -491,6 +491,7 @@ contract VRFCoordinatorV2 is VRF, ConfirmedOwner, TypeAndVersionInterface, VRFCo
     // The seed actually used by the VRF machinery, mixing in the blockhash
     uint256 actualSeed = uint256(keccak256(abi.encodePacked(proof.seed, blockHash)));
     randomness = VRF._randomValueFromVRFProof(proof, actualSeed); // Reverts on failure
+    return (keyHash, requestId, randomness);
   }
 
   /*