diff --git a/.github/actions/detect-solidity-foundry-version/action.yml b/.github/actions/detect-solidity-foundry-version/action.yml
new file mode 100644
index 00000000000..b37f1e25094
--- /dev/null
+++ b/.github/actions/detect-solidity-foundry-version/action.yml
@@ -0,0 +1,26 @@
+name: 'Detect Foundry version in GNUmakefile'
+description: 'Detects Foundry version in GNUmakefile'
+inputs:
+  working-directory:
+    description: 'The GNUmakefile directory'
+    required: false
+    default: 'contracts'
+outputs:
+  foundry-version:
+    description: 'Foundry version found in GNUmakefile'
+    value: ${{ steps.extract-foundry-version.outputs.foundry-version }}
+runs:
+  using: 'composite'
+  steps:
+    - name: Extract Foundry version
+      id: extract-foundry-version
+      shell: bash
+      working-directory: ${{ inputs.working-directory }}
+      run: |
+        foundry_version=$(grep -Eo "foundryup --version [^ ]+" GNUmakefile | awk '{print $3}')
+        if [ -z "$foundry_version" ]; then
+          echo "::error::Foundry version not found in GNUmakefile"
+          exit 1
+        fi
+        echo "Foundry version found: $foundry_version"
+        echo "foundry-version=$foundry_version" >> $GITHUB_OUTPUT
diff --git a/.github/actions/setup-slither/action.yaml b/.github/actions/setup-slither/action.yaml
new file mode 100644
index 00000000000..b8bef38575d
--- /dev/null
+++ b/.github/actions/setup-slither/action.yaml
@@ -0,0 +1,10 @@
+name: Setup Slither
+description: Installs Slither 0.10.3 for contract analysis. Requires Python 3.6 or higher.
+runs:
+  using: composite
+  steps:
+    - name: Install Slither
+      shell: bash
+      run: |
+        python -m pip install --upgrade pip
+        pip install slither-analyzer==0.10.3
diff --git a/.github/actions/setup-solc-select/action.yaml b/.github/actions/setup-solc-select/action.yaml
new file mode 100644
index 00000000000..b74ffae018d
--- /dev/null
+++ b/.github/actions/setup-solc-select/action.yaml
@@ -0,0 +1,30 @@
+name: Setup Solc Select
+description: Installs Solc Select, required versions and selects the version to use. Requires Python 3.6 or higher.
+inputs:
+  to_install:
+    description: Comma-separated list of solc versions to install
+    required: true
+  to_use:
+    description: Solc version to use
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Install solc-select and solc
+      shell: bash
+      run: |
+        pip3 install solc-select
+        sudo ln -s /usr/local/bin/solc-select /usr/bin/solc-select
+                
+        IFS=',' read -ra versions <<< "${{ inputs.to_install }}"
+        for version in "${versions[@]}"; do
+          solc-select install $version
+          if [ $? -ne 0 ]; then
+            echo "Failed to install Solc $version"
+            exit 1
+          fi
+        done
+        
+        solc-select install ${{ inputs.to_use }}
+        solc-select use ${{ inputs.to_use }}
diff --git a/.github/actions/validate-artifact-scope/action.yaml b/.github/actions/validate-artifact-scope/action.yaml
new file mode 100644
index 00000000000..7440efc63a3
--- /dev/null
+++ b/.github/actions/validate-artifact-scope/action.yaml
@@ -0,0 +1,103 @@
+name: Validate Artifact Scope
+description: Checks there are any modified Solidity files outside of the specified scope. If so, it prints a warning message, but does not fail the workflow.
+inputs:
+  product:
+    description: The product for which the artifacts are being generated
+    required: true
+  sol_files:
+    description: Comma-separated (CSV) or space-separated (shell) list of Solidity files to check
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Transform input array
+      id: transform_input_array
+      shell: bash
+      run: |
+        is_csv_format() {
+          local input="$1"
+          if [[ "$input" =~ "," ]]; then
+            return 0
+          else
+            return 1
+          fi
+        }
+        
+        is_space_separated_string() {
+          local input="$1"
+          if [[ "$input" =~ ^[^[:space:]]+([[:space:]][^[:space:]]+)*$ ]]; then
+            return 0
+          else
+            return 1
+          fi
+        }
+        
+        array="${{ inputs.sol_files }}"
+        
+        if is_csv_format "$array"; then
+          echo "::debug::CSV format detected, nothing to do"
+          echo "sol_files=$array" >> $GITHUB_OUTPUT
+          exit 0
+        fi
+        
+        if is_space_separated_string "$array"; then
+          echo "::debug::Space-separated format detected, converting to CSV"
+          csv_array="${array// /,}"
+          echo "sol_files=$csv_array" >> $GITHUB_OUTPUT
+          exit 0
+        fi
+        
+        echo "::error::Invalid input format for sol_files. Please provide a comma-separated (CSV) or space-separated (shell) list of Solidity files"
+        exit 1
+
+    - name: Check for changes outside of artifact scope
+      shell: bash
+      run: |
+        echo "::debug::All modified contracts:"
+        echo "${{ steps.transform_input_array.outputs.sol_files }}" | tr ',' '\n'
+        if [ "${{ inputs.product }}" = "shared" ]; then
+          excluded_paths_pattern="!/^contracts\/src\/v0\.8\/interfaces/ && !/^contracts\/src\/v0\.8\/${{ inputs.product }}/ && !/^contracts\/src\/v0\.8\/[^\/]+\.sol$/"
+        else
+          excluded_paths_pattern="!/^contracts\/src\/v0\.8\/${{ inputs.product }}/"
+        fi
+        echo "::debug::Excluded paths: $excluded_paths_pattern"
+        unexpected_files=$(echo "${{ steps.transform_input_array.outputs.sol_files }}" | tr ',' '\n' | awk "$excluded_paths_pattern")
+        missing_files=""
+        set -e 
+        set -o pipefail
+        if [[ -n "$unexpected_files" ]]; then
+          products=()
+          productsStr=""
+          IFS=$'\n' read -r -d '' -a files <<< "$unexpected_files" || true
+          echo "Files: ${files[@]}"
+        
+          for file in "${files[@]}"; do
+            missing_files+="$file,"
+        
+            product=$(echo "$file" | awk -F'src/v0.8/' '{if ($2 ~ /\//) print substr($2, 1, index($2, "/")-1); else print "shared"}')
+            if [[ ! " ${products[@]} " =~ " ${product} " ]]; then
+              products+=("$product")
+              productsStr+="$product, "
+            fi
+          done
+          productsStr=${productsStr%, }
+        
+          set +e 
+          set +o pipefail
+        
+          missing_files=$(echo $missing_files | tr ',' '\n')
+        
+          echo "Error: Found modified contracts outside of the expected scope: ${{ inputs.product }}"
+          echo "Files:"
+          echo "$missing_files"
+          echo "Action required: If you want to generate artifacts for other products ($productsStr) run this workflow again with updated configuration"
+        
+          echo "# Warning!" >> $GITHUB_STEP_SUMMARY
+          echo "## Reason: Found modified contracts outside of the expected scope: ${{ inputs.product }}" >> $GITHUB_STEP_SUMMARY
+          echo "### Files:" >> $GITHUB_STEP_SUMMARY
+          echo "$missing_files" >> $GITHUB_STEP_SUMMARY
+          echo "## Action required: If you want to generate artifacts for other products ($productsStr) run this workflow again with updated configuration" >> $GITHUB_STEP_SUMMARY            
+        else
+          echo "No unexpected files found."
+        fi
diff --git a/.github/actions/validate-solidity-artifacts/action.yaml b/.github/actions/validate-solidity-artifacts/action.yaml
new file mode 100644
index 00000000000..5357a87f96b
--- /dev/null
+++ b/.github/actions/validate-solidity-artifacts/action.yaml
@@ -0,0 +1,115 @@
+name: Validate Solidity Artifacts
+description: Checks whether Slither reports and UML diagrams were generated for all necessary files. If not, a warning is printed in job summary, but the job is not marked as failed.
+inputs:
+  slither_reports_path:
+    description: Path to the Slither reports directory (without trailing slash)
+    required: true
+  uml_diagrams_path:
+    description: Path to the UML diagrams directory  (without trailing slash)
+    required: true
+  validate_slither_reports:
+    description: Whether Slither reports should be validated
+    required: true
+  validate_uml_diagrams:
+    description: Whether UML diagrams should be validated
+    required: true
+  sol_files:
+    description: Comma-separated (CSV) or space-separated (shell) list of Solidity files to check
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Transform input array
+      id: transform_input_array
+      shell: bash
+      run: |
+        is_csv_format() {
+          local input="$1"
+          if [[ "$input" =~ "," ]]; then
+            return 0
+          else
+            return 1
+          fi
+        }
+        
+        is_space_separated_string() {
+          local input="$1"
+          if [[ "$input" =~ ^[^[:space:]]+([[:space:]][^[:space:]]+)*$ ]]; then
+            return 0
+          else
+            return 1
+          fi
+        }
+        
+        array="${{ inputs.sol_files }}"
+        
+        if is_csv_format "$array"; then
+          echo "::debug::CSV format detected, nothing to do"
+          echo "sol_files=$array" >> $GITHUB_OUTPUT
+          exit 0
+        fi
+        
+        if is_space_separated_string "$array"; then
+          echo "::debug::Space-separated format detected, converting to CSV"
+          csv_array="${array// /,}"
+          echo "sol_files=$csv_array" >> $GITHUB_OUTPUT
+          exit 0
+        fi
+        
+        echo "::error::Invalid input format for sol_files. Please provide a comma-separated (CSV) or space-separated (shell) list of Solidity files"
+        exit 1
+
+    - name: Validate UML diagrams
+      if: ${{ inputs.validate_uml_diagrams == 'true' }}
+      shell: bash
+      run: |
+        echo "Validating UML diagrams"        
+        IFS=',' read -r -a modified_files <<< "${{ steps.transform_input_array.outputs.sol_files }}"
+        missing_svgs=()        
+        for file in "${modified_files[@]}"; do
+          svg_file="$(basename "${file%.sol}").svg"
+          if [ ! -f "${{ inputs.uml_diagrams_path }}/$svg_file" ]; then
+            echo "Error: UML diagram for $file not found"
+            missing_svgs+=("$file")
+          fi
+        done
+        
+        if [ ${#missing_svgs[@]} -gt 0 ]; then
+            echo "Error: Missing UML diagrams for files: ${missing_svgs[@]}"
+            echo "# Warning!" >> $GITHUB_STEP_SUMMARY
+            echo "## Reason: Missing UML diagrams for files:" >> $GITHUB_STEP_SUMMARY
+            for file in "${missing_svgs[@]}"; do
+              echo " $file" >> $GITHUB_STEP_SUMMARY
+            done
+            echo "## Action required: Please try to generate artifacts for them locally or using a different tool" >> $GITHUB_STEP_SUMMARY
+        else 
+            echo "All UML diagrams generated successfully"
+        fi
+
+    - name: Validate Slither reports
+      if: ${{ inputs.validate_slither_reports == 'true' }}
+      shell: bash
+      run: |
+        echo "Validating Slither reports"
+        IFS=',' read -r -a modified_files <<< "${{ steps.transform_input_array.outputs.sol_files }}"
+        missing_reports=()
+        for file in "${modified_files[@]}"; do
+          report_file="$(basename "${file%.sol}")-slither-report.md"            
+          if [ ! -f "${{ inputs.slither_reports_path }}/$report_file" ]; then
+            echo "Error: Slither report for $file not found"
+            missing_reports+=("$file")
+          fi
+        done
+        
+        if [ ${#missing_reports[@]} -gt 0 ]; then
+            echo "Error: Missing Slither reports for files: ${missing_reports[@]}"
+            echo "# Warning!" >> $GITHUB_STEP_SUMMARY
+            echo "## Reason: Missing Slither reports for files:" >> $GITHUB_STEP_SUMMARY
+            for file in "${missing_reports[@]}"; do
+              echo " $file" >> $GITHUB_STEP_SUMMARY
+            done
+            echo "## Action required: Please try to generate artifacts for them locally" >> $GITHUB_STEP_SUMMARY
+        else 
+           echo "All Slither reports generated successfully"
+        fi
diff --git a/.github/workflows/solidity-foundry-artifacts.yml b/.github/workflows/solidity-foundry-artifacts.yml
new file mode 100644
index 00000000000..e489033d675
--- /dev/null
+++ b/.github/workflows/solidity-foundry-artifacts.yml
@@ -0,0 +1,371 @@
+name: Solidity Foundry Artifact Generation
+on:
+  workflow_dispatch:
+    inputs:
+      product:
+        type: choice
+        description: 'product for which to generate artifacts; should be the same as Foundry profile'
+        required: true
+        options:
+          - "automation"
+          - "ccip"
+          - "functions"
+          - "keystone"
+          - "l2ep"
+          - "liquiditymanager"
+          - "llo-feeds"
+          - "operatorforwarder"
+          - "shared"
+          - "transmission"
+          - "vrf"
+      base_ref:
+        description: 'commit or tag to be used as base reference, when looking for modified Solidity files'
+        required: true
+
+env:
+  FOUNDRY_PROFILE: ci
+
+jobs:
+  changes:
+    name: Detect changes
+    runs-on: ubuntu-latest
+    outputs:
+      changes: ${{ steps.changes.outputs.sol }}
+      product_changes: ${{ steps.changes-transform.outputs.product_changes }}
+      product_files: ${{ steps.changes-transform.outputs.product_files }}
+      changeset_changes: ${{ steps.changes-dorny.outputs.changeset }}
+      changeset_files: ${{ steps.changes-dorny.outputs.changeset_files }}
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - name: Find modified contracts
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        id: changes
+        with:
+          list-files: 'csv'
+          base: ${{ inputs.base_ref }}
+          predicate-quantifier: every
+          filters: |
+            ignored: &ignored
+              - '!contracts/src/v0.8/**/test/**'
+              - '!contracts/src/v0.8/**/tests/**'
+              - '!contracts/src/v0.8/**/mock/**'
+              - '!contracts/src/v0.8/**/mocks/**'
+              - '!contracts/src/v0.8/**/*.t.sol'
+              - '!contracts/src/v0.8/*.t.sol'
+              - '!contracts/src/v0.8/**/testhelpers/**'
+              - '!contracts/src/v0.8/testhelpers/**'
+              - '!contracts/src/v0.8/vendor/**'
+            other_shared:
+              - modified|added: 'contracts/src/v0.8/(interfaces/**/*.sol|*.sol)'
+              - *ignored
+            sol:
+              - modified|added: 'contracts/src/v0.8/**/*.sol'
+              - *ignored   
+            product: &product
+              - modified|added: 'contracts/src/v0.8/${{ inputs.product }}/**/*.sol'      
+              - *ignored
+            changeset:
+              - modified|added: 'contracts/.changeset/!(README)*.md' 
+
+      # Manual transformation needed, because shared contracts have a different folder structure
+      - name: Transform modified files
+        id: changes-transform
+        shell: bash
+        run: |
+          if [ "${{ inputs.product }}" = "shared" ]; then
+            echo "::debug:: Product is shared, transforming changes"
+            if [[ "${{ steps.changes.outputs.product }}" == "true" && "${{ steps.changes.outputs.other_shared }}" == "true" ]]; then
+              echo "::debug:: Changes were found in 'shared' folder and in 'interfaces' and root folders"
+              echo "product_changes=true" >> $GITHUB_OUTPUT
+              echo "product_files=${{ steps.changes.outputs.product_files }},${{ steps.changes.outputs.other_shared_files }}" >> $GITHUB_OUTPUT
+            elif [[ "${{ steps.changes.outputs.product }}" == "false" && "${{ steps.changes.outputs.other_shared }}" == "true" ]]; then
+              echo "::debug:: Only contracts in' interfaces' and root folders were modified"
+              echo "product_changes=true" >> $GITHUB_OUTPUT
+              echo "product_files=${{ steps.changes.outputs.other_shared_files }}" >> $GITHUB_OUTPUT
+            elif [[ "${{ steps.changes.outputs.product }}" == "true" && "${{ steps.changes.outputs.other_shared }}" == "false" ]]; then
+              echo "::debug:: Only contracts in 'shared' folder were modified"
+              echo "product_changes=true" >> $GITHUB_OUTPUT
+              echo "product_files=${{ steps.changes.outputs.product_files }}" >> $GITHUB_OUTPUT
+            else
+              echo "::debug:: No contracts were modified"
+              echo "product_changes=false" >> $GITHUB_OUTPUT
+              echo "product_files=" >> $GITHUB_OUTPUT
+            fi
+          else
+           echo "product_changes=${{ steps.changes.outputs.product }}" >> $GITHUB_OUTPUT
+           echo "product_files=${{ steps.changes.outputs.product_files }}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Check for changes outside of artifact scope
+        uses: ./.github/actions/validate-artifact-scope
+        if: ${{ steps.changes.outputs.sol == 'true' }}
+        with:
+          sol_files: ${{ steps.changes.outputs.sol_files }}
+          product: ${{ inputs.product }}
+
+  gather-basic-info:
+    name: Gather basic info
+    if: ${{ needs.changes.outputs.product_changes == 'true' }}
+    runs-on: ubuntu-22.04
+    needs: [ changes ]
+    outputs:
+      foundry_version: ${{ steps.extract-foundry-version.outputs.foundry-version }}
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        with:
+          fetch-depth: 0
+
+      - name: Extract Foundry version
+        uses: ./.github/actions/detect-solidity-foundry-version
+        with:
+          working-directory: contracts
+
+      - name: Copy modified changesets
+        if: ${{ needs.changes.outputs.changeset_changes == 'true' }}
+        run: |
+          mkdir -p contracts/changesets
+          files="${{ needs.changes.outputs.changeset_files }}"
+          IFS=",'
+          for changeset in $files; do
+            echo "::debug:: Copying $changeset"
+            cp $changeset contracts/changesets
+          done
+
+      - name: Generate basic info and modified contracts list
+        shell: bash
+        run: |
+          echo "Commit SHA used to generate artifacts: ${{ github.sha }}" > contracts/commit_sha_base_ref.txt
+          echo "Base reference SHA used to find modified contracts: ${{ inputs.base_ref }}" >> contracts/commit_sha_base_ref.txt     
+          
+          IFS=',' read -r -a modified_files <<< "${{ needs.changes.outputs.product_files }}"
+          echo "# Modified contracts:" > contracts/modified_contracts.md
+          for file in "${modified_files[@]}"; do
+            echo " - [$file](${{ github.server_url }}/${{ github.repository }}/blob/${{ github.sha }}/$file)" >> contracts/modified_contracts.md
+            echo "$file" >> contracts/modified_contracts.txt
+          done
+
+      - name: Upload basic info and modified contracts list
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        timeout-minutes: 2
+        continue-on-error: true
+        with:
+          name: tmp-basic-info
+          path: |
+            contracts/modified_contracts.md
+            contracts/modified_contracts.txt
+            contracts/commit_sha_base_ref.txt
+            contracts/changesets
+          retention-days: 7
+
+  # some of the artifacts can only be generated on product level, and we cannot scope them to single contracts
+  # some product-level modifications might also require shared contracts changes, so if these happened we need to generate artifacts for shared contracts as well
+  coverage-and-book:
+    if: ${{ needs.changes.outputs.product_changes == 'true' }}
+    name: Generate Docs and Code Coverage reports
+    runs-on: ubuntu-22.04
+    needs: [changes, gather-basic-info]
+    steps:
+      - name: Prepare exclusion list
+        id: prepare-exclusion-list
+        run: |
+          cat <<EOF > coverage_exclusions.json
+           ["automation", "functions", "vrf"]
+          EOF
+          coverage_exclusions=$(cat coverage_exclusions.json | jq -c .)
+          echo "coverage_exclusions=$coverage_exclusions" >> $GITHUB_OUTPUT
+
+      - name: Checkout the repo
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+
+      - name: Setup NodeJS
+        uses: ./.github/actions/setup-nodejs
+
+      - name: Create directories
+        shell: bash
+        run: |
+          mkdir -p contracts/code-coverage  
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0
+        with:
+          version: ${{ needs.gather-basic-info.outputs.foundry_version }}
+
+      # required for code coverage report generation
+      - name: Setup LCOV
+        uses: hrishikesh-kadam/setup-lcov@f5da1b26b0dcf5d893077a3c4f29cf78079c841d # v1.0.0
+
+      - name: Run Forge build for product contracts
+        if: ${{ needs.changes.outputs.product_changes == 'true' }}
+        run: |
+          forge --version
+          forge build
+        working-directory: contracts
+        env:
+          FOUNDRY_PROFILE: ${{ inputs.product }}
+
+      - name: Run coverage for product contracts
+        if: ${{ !contains(fromJson(steps.prepare-exclusion-list.outputs.coverage_exclusions), inputs.product) && needs.changes.outputs.product_changes == 'true' }}
+        working-directory: contracts
+        run: forge coverage --report lcov --report-file code-coverage/lcov.info
+        env:
+          FOUNDRY_PROFILE: ${{ inputs.product }}
+
+      - name: Generate Code Coverage HTML report for product contracts
+        if: ${{ !contains(fromJson(steps.prepare-exclusion-list.outputs.coverage_exclusions), inputs.product) && needs.changes.outputs.product_changes == 'true' }}
+        shell: bash
+        working-directory: contracts
+        run: genhtml code-coverage/lcov.info --branch-coverage --output-directory code-coverage
+
+      - name: Run Forge doc for product contracts
+        if: ${{ needs.changes.outputs.product_changes == 'true' }}
+        run: forge doc --build -o docs
+        working-directory: contracts
+        env:
+          FOUNDRY_PROFILE: ${{ inputs.product }}
+
+      - name: Upload Artifacts for product contracts
+        if: ${{ needs.changes.outputs.product_changes == 'true' }}
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        timeout-minutes: 2
+        continue-on-error: true
+        with:
+          name: tmp-${{ inputs.product }}-artifacts
+          path: |
+            contracts/docs
+            contracts/code-coverage/lcov-.info
+            contracts/code-coverage
+          retention-days: 7
+
+  # Generates UML diagrams and Slither reports for modified contracts
+  uml-static-analysis:
+    if: ${{ needs.changes.outputs.product_changes == 'true' }}
+    name: Generate UML and Slither reports for modified contracts
+    runs-on: ubuntu-22.04
+    needs: [changes, gather-basic-info]
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        with:
+          fetch-depth: 0
+
+      - name: Setup NodeJS
+        uses: ./.github/actions/setup-nodejs
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0
+        with:
+          version: ${{ needs.gather-basic-info.outputs.foundry_version }}
+
+      - name: Install Sol2uml
+        run: |
+          npm link sol2uml --only=production
+
+      - name: Set up Python
+        uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f #v5.1.1
+        with:
+          python-version: '3.8'
+
+      - name: Install solc-select and solc
+        uses: ./.github/actions/setup-solc-select
+        with:
+          to_install: '0.8.19'
+          to_use: '0.8.19'
+
+      - name: Install Slither
+        uses: ./.github/actions/setup-slither
+
+      - name: Generate UML
+        shell: bash
+        run: |
+          contract_list="${{ needs.changes.outputs.product_files }}"
+          
+          # modify remappings so that solc can find dependencies
+          ./contracts/scripts/ci/modify_remappings.sh contracts contracts/remappings.txt
+          mv remappings_modified.txt remappings.txt
+          
+          ./contracts/scripts/ci/generate_uml.sh "./" "contracts/uml-diagrams" "$contract_list"
+
+      - name: Generate Slither Markdown reports
+        run: |
+          contract_list="${{ needs.changes.outputs.product_files }}"
+          
+          echo "::debug::Processing contracts: $contract_list"
+          ./contracts/scripts/ci/generate_slither_report.sh "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.sha }}/" contracts/configs/slither/.slither.config-artifacts.json "." "$contract_list" "contracts/slither-reports" "--solc-remaps @=contracts/node_modules/@"
+
+      - name: Upload UMLs and Slither reports
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        timeout-minutes: 10
+        continue-on-error: true
+        with:
+          name: tmp-contracts-artifacts
+          path: |
+            contracts/uml-diagrams
+            contracts/slither-reports
+          retention-days: 7
+
+      - name: Validate if all Slither run for all contracts
+        uses: ./.github/actions/validate-solidity-artifacts
+        with:
+          validate_slither_reports: 'true'
+          validate_uml_diagrams: 'true'
+          slither_reports_path: 'contracts/slither-reports'
+          uml_diagrams_path: 'contracts/uml-diagrams'
+          sol_files: ${{ needs.changes.outputs.product_files }}
+
+  gather-all-artifacts:
+    name: Gather all artifacts
+    if: ${{ needs.changes.outputs.product_changes == 'true' }}
+    runs-on: ubuntu-latest
+    needs: [coverage-and-book, uml-static-analysis, gather-basic-info, changes]
+    steps:
+      - name: Download all artifacts
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+        with:
+          path: review_artifacts
+          merge-multiple: true
+
+      - name: Upload all artifacts as single package
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        with:
+          name: review-artifacts-${{ inputs.product }}-${{ github.sha }}
+          path: review_artifacts
+          retention-days: 60
+
+      - name: Remove temporary artifacts
+        uses: geekyeggo/delete-artifact@24928e75e6e6590170563b8ddae9fac674508aa1 # v5.0
+        with:
+          name: tmp-*
+
+      - name: Print Artifact URL in job summary
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          ARTIFACTS=$(gh api -X GET repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts)
+          ARTIFACT_ID=$(echo "$ARTIFACTS" | jq '.artifacts[] | select(.name=="review-artifacts-${{ inputs.product }}-${{ github.sha }}") | .id')
+          echo "Artifact ID: $ARTIFACT_ID"
+          
+          echo "# Solidity Review Artifact Generated" >> $GITHUB_STEP_SUMMARY
+          echo "Base Ref used: **${{ inputs.base_ref }}**" >> $GITHUB_STEP_SUMMARY
+          echo "Commit SHA used: **${{ github.sha }}**" >> $GITHUB_STEP_SUMMARY
+          echo "[Artifact URL](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts/$ARTIFACT_ID)" >> $GITHUB_STEP_SUMMARY
+
+  notify-no-changes:
+    if: ${{ needs.changes.outputs.product_changes == 'false' }}
+    needs: [changes]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Print warning in job summary
+        shell: bash
+        run: |
+          echo "# Solidity Review Artifact NOT Generated" >> $GITHUB_STEP_SUMMARY
+          echo "Base Ref used: **${{ inputs.base_ref }}**" >> $GITHUB_STEP_SUMMARY
+          echo "Commit SHA used: **${{ github.sha }}**" >> $GITHUB_STEP_SUMMARY
+          echo "## Reason: No modified Solidity files found for ${{ inputs.product }}" >> $GITHUB_STEP_SUMMARY
+          echo "* no modified Solidity files found between ${{ inputs.base_ref }} and ${{ github.sha }} commits" >> $GITHUB_STEP_SUMMARY
+          echo "* or they are located outside of ./contracts/src/v0.8 folder" >> $GITHUB_STEP_SUMMARY
+          echo "* or they were limited to test files" >> $GITHUB_STEP_SUMMARY
+          exit 1
diff --git a/.github/workflows/solidity-foundry.yml b/.github/workflows/solidity-foundry.yml
index 4ec9e424471..906cb76ffe5 100644
--- a/.github/workflows/solidity-foundry.yml
+++ b/.github/workflows/solidity-foundry.yml
@@ -3,42 +3,122 @@ on: [pull_request]
 
 env:
   FOUNDRY_PROFILE: ci
-  # Has to match the `make foundry` version in `contracts/GNUmakefile`
-  FOUNDRY_VERSION: nightly-de33b6af53005037b463318d2628b5cfcaf39916
+
+# Making changes:
+# * use the top-level matrix to decide, which checks should run for each product.
+# * when enabling code coverage, remember to adjust the minimum code coverage as it's set to 98.5% by default.
 
 jobs:
+  define-matrix:
+    name: Define test matrix
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.define-matrix.outputs.matrix }}
+      foundry-version: ${{ steps.extract-foundry-version.outputs.foundry-version }}
+    steps:
+      - name: Define test matrix
+        id: define-matrix
+        shell: bash
+        run: |
+          cat <<EOF > matrix.json
+          [
+            { "name": "automation", "setup": { "run-coverage": false, "min-coverage": 98.5, "run-gas-snapshot": false, "run-forge-fmt": false }},
+            { "name": "ccip", "setup": { "run-coverage": true, "min-coverage": 98.5, "run-gas-snapshot": true, "run-forge-fmt": true }},
+            { "name": "functions", "setup": { "run-coverage": false, "min-coverage": 98.5, "run-gas-snapshot": true, "run-forge-fmt": false }},
+            { "name": "keystone", "setup": { "run-coverage": true, "min-coverage": 74.1, "run-gas-snapshot": false, "run-forge-fmt": false }},
+            { "name": "l2ep", "setup": { "run-coverage": true, "min-coverage": 65.6, "run-gas-snapshot": true, "run-forge-fmt": false }},
+            { "name": "liquiditymanager", "setup": { "run-coverage": true, "min-coverage": 46.3, "run-gas-snapshot": true, "run-forge-fmt": false }},
+            { "name": "llo-feeds", "setup": { "run-coverage": true, "min-coverage": 49.3, "run-gas-snapshot": true, "run-forge-fmt": false }},
+            { "name": "operatorforwarder", "setup": { "run-coverage": true, "min-coverage": 55.7, "run-gas-snapshot": true, "run-forge-fmt": false }},
+            { "name": "shared", "setup": { "run-coverage": true, "min-coverage": 32.6, "run-gas-snapshot": true, "run-forge-fmt": false }},
+            { "name": "transmission", "setup": { "run-coverage": true, "min-coverage": 65.6, "run-gas-snapshot": true, "run-forge-fmt": false }},
+            { "name": "vrf", "setup": { "run-coverage": false, "min-coverage": 98.5, "run-gas-snapshot": false, "run-forge-fmt": false }}
+          ]
+          EOF
+          
+          matrix=$(cat matrix.json | jq -c .)
+          echo "matrix=$matrix" >> $GITHUB_OUTPUT
+
+      - name: Checkout the repo
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+
+      - name: Extract Foundry version
+        id: extract-foundry-version
+        uses: ./.github/actions/detect-solidity-foundry-version
+        with:
+          working-directory: contracts
+
   changes:
     name: Detect changes
     runs-on: ubuntu-latest
     outputs:
-      changes: ${{ steps.changes.outputs.src }}
+      non_src_changes: ${{ steps.changes.outputs.non_src }}
+      sol_modified: ${{ steps.changes.outputs.sol }}
+      sol_modified_files: ${{ steps.changes.outputs.sol_files }}
+      not_test_sol_modified: ${{ steps.changes.outputs.not_test_sol }}
+      not_test_sol_modified_files: ${{ steps.changes.outputs.not_test_sol_files }}
+      all_changes: ${{ steps.changes.outputs.changes }}
     steps:
       - name: Checkout the repo
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: changes
         with:
+          list-files: 'shell'
           filters: |
-            src:
-              - 'contracts/src/v0.8/**/*'
+            non_src:
               - '.github/workflows/solidity-foundry.yml'
               - 'contracts/foundry.toml'
               - 'contracts/gas-snapshots/*.gas-snapshot'
+              - 'contracts/package.json'
+            sol:
+              - modified|added: 'contracts/src/v0.8/**/*.sol'
+            not_test_sol:
+              - modified|added: 'contracts/src/v0.8/**/!(*.t).sol'            
+            automation:
+              - 'contracts/src/v0.8/automation/**/*.sol'
+            ccip:
+              - 'contracts/src/v0.8/ccip/**/*.sol'
+            functions:
+              - 'contracts/src/v0.8/functions/**/*.sol'
+            keystone:
+              - 'contracts/src/v0.8/keystone/**/*.sol'
+            l2ep:
+              - 'contracts/src/v0.8/l2ep/**/*.sol'
+            liquiditymanager:
+              - 'contracts/src/v0.8/liquiditymanager/**/*.sol'
+            llo-feeds:
+              - 'contracts/src/v0.8/llo-feeds/**/*.sol'
+            operatorforwarder:
+              - 'contracts/src/v0.8/operatorforwarder/**/*.sol'
+            vrf:
+              - 'contracts/src/v0.8/vrf/**/*.sol'
+            shared:
+              - 'contracts/src/v0.8/shared/**/*.sol'
+              - 'contracts/src/v0.8/*.sol'
+              - 'contracts/src/v0.8/mocks/**/*.sol'
+              - 'contracts/src/v0.8/tests/**/*.sol'
+              - 'contracts/src/v0.8/vendor/**/*.sol'
+            transmission:
+              - 'contracts/src/v0.8/transmission/**/*.sol'
 
   tests:
+    if: ${{ needs.changes.outputs.non_src_changes == 'true' || needs.changes.outputs.sol_modified == 'true' }}
     strategy:
       fail-fast: false
       matrix:
-        product: [automation, ccip, functions, keystone, l2ep, liquiditymanager, llo-feeds, operatorforwarder, shared, vrf]
-    needs: [changes]
-    name: Foundry Tests ${{ matrix.product }}
-    # See https://github.com/foundry-rs/foundry/issues/3827
+        product: ${{fromJson(needs.define-matrix.outputs.matrix)}}
+    needs: [define-matrix, changes]
+    name: Foundry Tests ${{ matrix.product.name }}
     runs-on: ubuntu-22.04
 
     # The if statements for steps after checkout repo is workaround for
     # passing required check for PRs that don't have filtered changes.
     steps:
       - name: Checkout the repo
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true' }}
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           submodules: recursive
@@ -47,127 +127,241 @@ jobs:
       # and not native Foundry. This is to make sure the dependencies
       # stay in sync.
       - name: Setup NodeJS
-        if: needs.changes.outputs.changes == 'true'
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true' }}
         uses: ./.github/actions/setup-nodejs
 
       - name: Install Foundry
-        if: needs.changes.outputs.changes == 'true'
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true' }}
         uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0
         with:
-          version: ${{ env.FOUNDRY_VERSION }}
+          version: ${{ needs.define-matrix.outputs.foundry-version }}
 
       - name: Run Forge build
-        if: needs.changes.outputs.changes == 'true'
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true' }}
         run: |
           forge --version
           forge build
         id: build
         working-directory: contracts
         env:
-          FOUNDRY_PROFILE: ${{ matrix.product }}
+          FOUNDRY_PROFILE: ${{ matrix.product.name }}
 
       - name: Run Forge tests
-        if: needs.changes.outputs.changes == 'true'
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true' }}
         run: |
           forge test -vvv
         id: test
         working-directory: contracts
         env:
-          FOUNDRY_PROFILE: ${{ matrix.product }}
+          FOUNDRY_PROFILE: ${{ matrix.product.name }}
 
       - name: Run Forge snapshot
-        if: ${{ !contains(fromJson('["vrf"]'), matrix.product) && !contains(fromJson('["automation"]'), matrix.product) && !contains(fromJson('["keystone"]'), matrix.product) && needs.changes.outputs.changes == 'true' }}
+        if: ${{ (contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true')
+          && matrix.product.setup.run-gas-snapshot }}
         run: |
-          forge snapshot --nmt "test_?Fuzz_\w{1,}?" --check gas-snapshots/${{ matrix.product }}.gas-snapshot
+          forge snapshot --nmt "test_?Fuzz_\w{1,}?" --check gas-snapshots/${{ matrix.product.name }}.gas-snapshot
         id: snapshot
         working-directory: contracts
         env:
-          FOUNDRY_PROFILE: ${{ matrix.product }}
+          FOUNDRY_PROFILE: ${{ matrix.product.name }}
 
-      - name: Run coverage
-        if: ${{ contains(fromJson('["ccip"]'), matrix.product) && needs.changes.outputs.changes == 'true' }}
+      # required for code coverage report generation
+      - name: Setup LCOV
+        if: ${{ (contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true')
+          && matrix.product.setup.run-coverage }}
+        uses: hrishikesh-kadam/setup-lcov@f5da1b26b0dcf5d893077a3c4f29cf78079c841d # v1.0.0
+
+      - name: Run coverage for ${{ matrix.product.name }}
+        if: ${{ (contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true')
+          && matrix.product.setup.run-coverage }}
         working-directory: contracts
         run: forge coverage --report lcov
         env:
-          FOUNDRY_PROFILE: ${{ matrix.product }}
+          FOUNDRY_PROFILE: ${{ matrix.product.name }}
 
-      - name: Prune report
-        if: ${{ contains(fromJson('["ccip"]'), matrix.product) && needs.changes.outputs.changes == 'true' }}
+      - name: Prune lcov report
+        if: ${{ (contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true')
+          && matrix.product.setup.run-coverage }}
         run: |
           sudo apt-get install lcov
-          ./contracts/scripts/ccip_lcov_prune ./contracts/lcov.info ./lcov.info.pruned
+          ./contracts/scripts/lcov_prune ${{ matrix.product.name }} ./contracts/lcov.info ./contracts/lcov.info.pruned
 
-      - name: Report code coverage
-        if: ${{ contains(fromJson('["ccip"]'), matrix.product) && needs.changes.outputs.changes == 'true' }}
+      - name: Report code coverage for ${{ matrix.product.name }}
+        if: ${{ (contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true')
+          && matrix.product.setup.run-coverage }}
         uses: zgosalvez/github-actions-report-lcov@a546f89a65a0cdcd82a92ae8d65e74d450ff3fbc # v4.1.4
         with:
-          update-comment: true
-          coverage-files: lcov.info.pruned
-          minimum-coverage: 98.5
-          artifact-name: code-coverage-report
+          update-comment: false
+          coverage-files: ./contracts/lcov.info.pruned
+          minimum-coverage: ${{ matrix.product.min-coverage }}
+          artifact-name: code-coverage-report-${{ matrix.product.name }}
           working-directory: ./contracts
-          github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Collect Metrics
-        if: needs.changes.outputs.changes == 'true'
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true' }}
         id: collect-gha-metrics
         uses: smartcontractkit/push-gha-metrics-action@d9da21a2747016b3e13de58c7d4115a3d5c97935 # v3.0.1
         with:
-          id: solidity-foundry
+          id: ${{ matrix.product.name }}-solidity-foundry
+          org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
+          basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
+          this-job-name: Foundry Tests ${{ matrix.product.name }}
+        continue-on-error: true
+
+  analyze:
+    needs: [ changes, define-matrix ]
+    name: Run static analysis
+    if: needs.changes.outputs.not_test_sol_modified == 'true'
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        with:
+          submodules: recursive
+
+      - name: Setup NodeJS
+        uses: ./.github/actions/setup-nodejs
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0
+        with:
+          version: ${{ needs.define-matrix.outputs.foundry-version }}
+
+      - name: Set up Python
+        uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f #v5.1.1
+        with:
+          python-version: '3.8'
+
+      - name: Install solc-select and solc
+        uses: ./.github/actions/setup-solc-select
+        with:
+          to_install: '0.8.19'
+          to_use: '0.8.19'
+
+      - name: Install Slither
+        uses: ./.github/actions/setup-slither
+
+      - name: Run Slither
+        shell: bash
+        run: |          
+          # modify remappings so that solc can find dependencies
+          ./contracts/scripts/ci/modify_remappings.sh contracts contracts/remappings.txt
+          mv remappings_modified.txt remappings.txt
+
+          FILES="${{ needs.changes.outputs.not_test_sol_modified_files }}"
+          
+          for FILE in $FILES; do
+            PRODUCT=$(echo "$FILE" | awk -F'src/[^/]*/' '{print $2}' | cut -d'/' -f1)
+            echo "::debug::Running Slither for $FILE in $PRODUCT"
+            SLITHER_CONFIG="contracts/configs/slither/.slither.config-$PRODUCT-pr.json"
+            if [ ! -f $SLITHER_CONFIG ]; then
+              echo "::debug::No Slither config found for $PRODUCT, using default"
+              SLITHER_CONFIG="contracts/configs/slither/.slither.config-default-pr.json"
+            fi
+            ./contracts/scripts/ci/generate_slither_report.sh "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.sha }}/" "$SLITHER_CONFIG" "." "$FILE" "contracts/slither-reports" "--solc-remaps @=contracts/node_modules/@"
+          done
+
+      - name: Print Slither summary
+        shell: bash
+        run: |
+          echo "# Static analysis results " >> $GITHUB_STEP_SUMMARY
+          for file in "contracts/slither-reports"/*.md; do
+            if [ -e "$file" ]; then
+              cat "$file" >> $GITHUB_STEP_SUMMARY
+            fi
+          done
+
+      - name: Validate if all Slither run for all contracts
+        uses: ./.github/actions/validate-solidity-artifacts
+        with:
+          validate_slither_reports: 'true'
+          slither_reports_path: 'contracts/slither-reports'
+          sol_files: ${{ needs.changes.outputs.not_test_sol_modified_files }}
+
+      - name: Upload Slither report
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        timeout-minutes: 10
+        continue-on-error: true
+        with:
+          name: slither-reports-${{ github.sha }}
+          path: |
+            contracts/slither-reports
+          retention-days: 7
+
+      - name: Collect Metrics
+        id: collect-gha-metrics
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
+        with:
+          id: solidity-foundry-slither
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
-          this-job-name: Foundry Tests ${{ matrix.product }}
+          this-job-name: Run static analysis
         continue-on-error: true
 
   solidity-forge-fmt:
+    name: Forge fmt ${{ matrix.product.name }}
+    if: ${{ needs.changes.outputs.non_src_changes == 'true' || needs.changes.outputs.not_test_sol_modified == 'true' }}
+    needs: [define-matrix, changes]
     strategy:
       fail-fast: false
       matrix:
-        product: [ ccip ]
-    needs: [ changes ]
-    name: Forge fmt ${{ matrix.product }}
-    # See https://github.com/foundry-rs/foundry/issues/3827
+        product: ${{fromJson(needs.define-matrix.outputs.matrix)}}
     runs-on: ubuntu-22.04
-
-    # The if statements for steps after checkout repo is workaround for
-    # passing required check for PRs that don't have filtered changes.
     steps:
       - name: Checkout the repo
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name) && matrix.product.setup.run-forge-fmt }}
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           submodules: recursive
 
-      # Only needed because we use the NPM versions of packages
-      # and not native Foundry. This is to make sure the dependencies
-      # stay in sync.
       - name: Setup NodeJS
-        if: needs.changes.outputs.changes == 'true'
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name) && matrix.product.setup.run-forge-fmt }}
         uses: ./.github/actions/setup-nodejs
 
       - name: Install Foundry
-        if: needs.changes.outputs.changes == 'true'
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name) && matrix.product.setup.run-forge-fmt }}
         uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0
         with:
-          version: ${{ env.FOUNDRY_VERSION }}
+          version: ${{ needs.define-matrix.outputs.foundry-version }}
 
       - name: Run Forge fmt
-        if: needs.changes.outputs.changes == 'true'
-        run: |
-          forge fmt --check
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name) && matrix.product.setup.run-forge-fmt }}
+        run: forge fmt --check
         id: fmt
         working-directory: contracts
         env:
-          FOUNDRY_PROFILE: ${{ matrix.product }}
+          FOUNDRY_PROFILE: ${{ matrix.product.name }}
 
       - name: Collect Metrics
-        if: needs.changes.outputs.changes == 'true'
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name) && matrix.product.setup.run-forge-fmt }}
         id: collect-gha-metrics
         uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
-          id: solidity-forge-fmt
+          id: solidity-forge-fmt-${{ matrix.product.name }}
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
-          this-job-name: Foundry Tests ${{ matrix.product }}
+          this-job-name: Forge fmt ${{ matrix.product.name }}
         continue-on-error: true
diff --git a/.github/workflows/solidity-hardhat.yml b/.github/workflows/solidity-hardhat.yml
index f28cf499072..705fad3be60 100644
--- a/.github/workflows/solidity-hardhat.yml
+++ b/.github/workflows/solidity-hardhat.yml
@@ -84,4 +84,4 @@ jobs:
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
           this-job-name: Solidity
-        continue-on-error: true
\ No newline at end of file
+        continue-on-error: true
diff --git a/contracts/.changeset/itchy-deers-deny.md b/contracts/.changeset/itchy-deers-deny.md
new file mode 100644
index 00000000000..888d58ce311
--- /dev/null
+++ b/contracts/.changeset/itchy-deers-deny.md
@@ -0,0 +1,5 @@
+---
+"@chainlink/contracts": patch
+---
+
+More comprehensive & product-scoped Solidity Foundry pipeline
diff --git a/contracts/configs/slither/.slither.config-artifacts.json b/contracts/configs/slither/.slither.config-artifacts.json
new file mode 100644
index 00000000000..75071341f51
--- /dev/null
+++ b/contracts/configs/slither/.slither.config-artifacts.json
@@ -0,0 +1,3 @@
+{
+  "filter_paths": "(openzeppelin|mocks/|test/|tests/|testhelpers)"
+}
diff --git a/contracts/configs/slither/.slither.config-ccip-pr.json b/contracts/configs/slither/.slither.config-ccip-pr.json
new file mode 100644
index 00000000000..84d231ea07b
--- /dev/null
+++ b/contracts/configs/slither/.slither.config-ccip-pr.json
@@ -0,0 +1,4 @@
+{
+  "filter_paths": "(openzeppelin|mocks/|test/|tests/|testhelpers)",
+  "detectors_to_exclude": "pragma,solc-version,naming-convention,assembly,reentrancy-events,timestamp,calls-loop,unused-return"
+}
diff --git a/contracts/configs/slither/.slither.config-default-pr.json b/contracts/configs/slither/.slither.config-default-pr.json
new file mode 100644
index 00000000000..1ef145a7954
--- /dev/null
+++ b/contracts/configs/slither/.slither.config-default-pr.json
@@ -0,0 +1,4 @@
+{
+  "filter_paths": "(openzeppelin|mocks/|test/|tests/|testhelpers)",
+  "detectors_to_exclude": "pragma"
+}
diff --git a/contracts/scripts/ccip_lcov_prune b/contracts/scripts/ccip_lcov_prune
deleted file mode 100755
index 002e5a3f133..00000000000
--- a/contracts/scripts/ccip_lcov_prune
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-# src/v0.8/ccip/libraries/Internal.sol
-# src/v0.8/ccip/libraries/RateLimiter.sol
-# src/v0.8/ccip/libraries/USDPriceWith18Decimals.sol
-# src/v0.8/ccip/libraries/MerkleMultiProof.sol
-# src/v0.8/ccip/libraries/Pool.sol
-# excluded because Foundry doesn't support coverage on library files
-
-# BurnWithFromMintTokenPool is excluded because Forge doesn't seem to
-# register coverage, even though it is 100% covered.
-
-lcov --remove $1 -o $2 \
-  '*/ccip/test/*' \
-  '*/vendor/*' \
-  '*/shared/*' \
-  'src/v0.8/ccip/ocr/OCR2Abstract.sol' \
-  'src/v0.8/ccip/libraries/Internal.sol' \
-  'src/v0.8/ccip/libraries/RateLimiter.sol' \
-  'src/v0.8/ccip/libraries/USDPriceWith18Decimals.sol' \
-  'src/v0.8/ccip/libraries/MerkleMultiProof.sol' \
-  'src/v0.8/ccip/libraries/Pool.sol' \
-  'src/v0.8/ConfirmedOwnerWithProposal.sol' \
-  'src/v0.8/tests/MockV3Aggregator.sol' \
-  'src/v0.8/ccip/applications/CCIPClientExample.sol' \
-  'src/v0.8/ccip/pools/BurnWithFromMintTokenPool.sol' \
-  --rc lcov_branch_coverage=1
diff --git a/contracts/scripts/ci/generate_slither_report.sh b/contracts/scripts/ci/generate_slither_report.sh
new file mode 100755
index 00000000000..7fe31d40efc
--- /dev/null
+++ b/contracts/scripts/ci/generate_slither_report.sh
@@ -0,0 +1,87 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+function check_chainlink_dir() {
+  local param_dir="chainlink"
+  current_dir=$(pwd)
+
+  current_base=$(basename "$current_dir")
+
+  if [[ "$current_base" != "$param_dir" ]]; then
+    >&2 echo "The script must be run from the root of $param_dir directory"
+    exit 1
+  fi
+}
+
+check_chainlink_dir
+
+if [ "$#" -lt 5 ]; then
+  >&2 echo "Generates Markdown Slither reports and saves them to a target directory."
+  >&2 echo "Usage: $0 <https://github.com/ORG/REPO/blob/COMMIT/> <config-file> <root-directory-with–contracts> <comma-separated list of contracts> <where-to-save-reports> [slither extra params]"
+  exit 1
+fi
+
+REPO_URL=$1
+CONFIG_FILE=$2
+SOURCE_DIR=$3
+FILES=${4// /}  # Remove any spaces from the list of files
+TARGET_DIR=$5
+SLITHER_EXTRA_PARAMS=$6
+
+run_slither() {
+    local FILE=$1
+    local TARGET_DIR=$2
+
+    if [[ ! -f "$FILE" ]]; then
+      >&2 echo "::error:File not found: $FILE"
+      return 1
+    fi
+
+    set +e
+    source ./contracts/scripts/ci/select_solc_version.sh "$FILE"
+    if [[ $? -ne 0 ]]; then
+        >&2 echo "::error::Failed to select Solc version for $FILE"
+        return 1
+    fi
+    set -e
+
+    SLITHER_OUTPUT_FILE="$TARGET_DIR/$(basename "${FILE%.sol}")-slither-report.md"
+
+    output=$(slither --config-file "$CONFIG_FILE" "$FILE" --checklist --markdown-root "$REPO_URL" --fail-none $SLITHER_EXTRA_PARAMS)
+    if [ $? -ne 0 ]; then
+        >&2 echo "::error::Slither failed for $FILE"
+        exit 1
+    fi
+    output=$(echo "$output" | sed '/\*\*THIS CHECKLIST IS NOT COMPLETE\*\*. Use `--show-ignored-findings` to show all the results./d'  | sed '/Summary/d')
+
+    echo "# Summary for $FILE" > "$SLITHER_OUTPUT_FILE"
+    echo "$output" >> "$SLITHER_OUTPUT_FILE"
+
+    if [[ -z "$output" ]]; then
+        echo "No issues found." >> "$SLITHER_OUTPUT_FILE"
+    fi
+}
+
+process_files() {
+    local SOURCE_DIR=$1
+    local TARGET_DIR=$2
+    local FILES=(${3//,/ })  # Split the comma-separated list into an array
+
+    mkdir -p "$TARGET_DIR"
+
+    for FILE in "${FILES[@]}"; do
+      FILE=${FILE//\"/}
+      run_slither "$SOURCE_DIR/$FILE" "$TARGET_DIR"
+    done
+}
+
+set +e
+process_files "$SOURCE_DIR" "$TARGET_DIR" "${FILES[@]}"
+
+if [[ $? -ne 0 ]]; then
+    >&2 echo "::error::Failed to generate Slither reports"
+    exit 1
+fi
+
+echo "Slither reports saved in $TARGET_DIR folder"
diff --git a/contracts/scripts/ci/generate_uml.sh b/contracts/scripts/ci/generate_uml.sh
new file mode 100755
index 00000000000..65745c93bbe
--- /dev/null
+++ b/contracts/scripts/ci/generate_uml.sh
@@ -0,0 +1,121 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+function check_chainlink_dir() {
+  local param_dir="chainlink"
+  current_dir=$(pwd)
+
+  current_base=$(basename "$current_dir")
+
+  if [[ "$current_base" != "$param_dir" ]]; then
+    >&2 echo "The script must be run from the root of $param_dir directory"
+    exit 1
+  fi
+}
+
+check_chainlink_dir
+
+if [ "$#" -lt 2 ]; then
+    >&2 echo "Generates UML diagrams for all contracts in a directory after flattening them to avoid call stack overflows."
+    >&2 echo "Usage: $0 <path to contracts> <path to target directory> [comma-separated list of files]"
+    exit 1
+fi
+
+SOURCE_DIR="$1"
+TARGET_DIR="$2"
+FILES=${3// /}  # Remove any spaces from the list of files
+FAILED_FILES=()
+
+flatten_and_generate_uml() {
+    local FILE=$1
+    local TARGET_DIR=$2
+
+    set +e
+    FLATTENED_FILE="$TARGET_DIR/flattened_$(basename "$FILE")"
+    echo "::debug::Flattening $FILE to $FLATTENED_FILE"
+    forge flatten "$FILE" -o "$FLATTENED_FILE" --root contracts
+    if [[ $? -ne 0 ]]; then
+        >&2 echo "::error::Failed to flatten $FILE"
+        FAILED_FILES+=("$FILE")
+        return
+    fi
+
+    OUTPUT_FILE=${FLATTENED_FILE//"flattened_"/""}
+    OUTPUT_FILE_SVG="${OUTPUT_FILE%.sol}.svg"
+    echo "::debug::Generating SVG UML for $FLATTENED_FILE to $OUTPUT_FILE_SVG"
+    sol2uml "$FLATTENED_FILE" -o "$OUTPUT_FILE_SVG"
+    if [[ $? -ne 0 ]]; then
+        >&2 echo "::error::Failed to generate UML diagram in SVG format for $FILE"
+        FAILED_FILES+=("$FILE")
+        rm "$FLATTENED_FILE"
+        return
+    fi
+    OUTPUT_FILE_DOT="${OUTPUT_FILE%.sol}.dot"
+    echo "::debug::Generating DOT UML for $FLATTENED_FILE to $OUTPUT_FILE_DOT"
+    sol2uml "$FLATTENED_FILE" -o "$OUTPUT_FILE_DOT" -f dot
+    if [[ $? -ne 0 ]]; then
+        >&2 echo "::error::Failed to generate UML diagram in DOT format for $FILE"
+        FAILED_FILES+=("$FILE")
+        rm "$FLATTENED_FILE"
+        return
+    fi
+
+    rm "$FLATTENED_FILE"
+    set -e
+}
+
+process_all_files_in_directory() {
+    local SOURCE_DIR=$1
+    local TARGET_DIR=$2
+
+    mkdir -p "$TARGET_DIR"
+
+    find "$SOURCE_DIR" -type f -name '*.sol' | while read -r ITEM; do
+        flatten_and_generate_uml "$ITEM" "$TARGET_DIR"
+    done
+}
+
+process_selected_files() {
+    local SOURCE_DIR=$1
+    local TARGET_DIR=$2
+    local FILES=(${3//,/ })  # Split the comma-separated list into an array
+
+    mkdir -p "$TARGET_DIR"
+
+    for FILE in "${FILES[@]}"; do
+        FILE=${FILE//\"/}
+        MATCHES=($(find "$SOURCE_DIR" -type f -path "*/$FILE"))
+
+        if [[ ${#MATCHES[@]} -gt 1 ]]; then
+            >&2 echo "Error: Multiple matches found for $FILE:"
+            for MATCH in "${MATCHES[@]}"; do
+                >&2 echo "  $MATCH"
+            done
+            exit 1
+        elif [[ ${#MATCHES[@]} -eq 1 ]]; then
+            >&2 echo "::debug::File found: ${MATCHES[0]}"
+            flatten_and_generate_uml "${MATCHES[0]}" "$TARGET_DIR"
+        else
+            >&2 echo "::error::File $FILE does not exist within the source directory $SOURCE_DIR."
+            exit 1
+        fi
+    done
+}
+
+# if FILES is empty, process all files in the directory, otherwise process only the selected files
+if [[ -z "$FILES" ]]; then
+    process_all_files_in_directory "$SOURCE_DIR" "$TARGET_DIR"
+else
+    process_selected_files "$SOURCE_DIR" "$TARGET_DIR" "$FILES"
+fi
+
+if [[ "${#FAILED_FILES[@]}" -gt 0 ]]; then
+    >&2 echo ":error::Failed to generate UML diagrams for ${#FAILED_FILES[@]} files:"
+    for FILE in "${FAILED_FILES[@]}"; do
+        >&2 echo "  $FILE"
+        echo "$FILE" >> "$TARGET_DIR/uml_generation_failures.txt"
+    done
+fi
+
+echo "UML diagrams saved in $TARGET_DIR folder"
diff --git a/contracts/scripts/ci/modify_remappings.sh b/contracts/scripts/ci/modify_remappings.sh
new file mode 100755
index 00000000000..e64ca369b0c
--- /dev/null
+++ b/contracts/scripts/ci/modify_remappings.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if [ "$#" -ne 2 ]; then
+    >&2 echo "Usage: $0 <directory_prefix> <remappings_file>"
+    exit 1
+fi
+
+DIR_PREFIX=$1
+REMAPPINGS_FILE=$2
+
+if [ ! -f "$REMAPPINGS_FILE" ]; then
+    >&2 echo "::error:: Remappings file '$REMAPPINGS_FILE' not found."
+    exit 1
+fi
+
+OUTPUT_FILE="remappings_modified.txt"
+
+while IFS= read -r line; do
+    if [[ "$line" =~ ^[^=]+= ]]; then
+        REMAPPED_PATH="${line#*=}"
+        MODIFIED_LINE="${line%=*}=${DIR_PREFIX}/${REMAPPED_PATH}"
+        echo "$MODIFIED_LINE" >> "$OUTPUT_FILE"
+    else
+        echo "$line" >> "$OUTPUT_FILE"
+    fi
+done < "$REMAPPINGS_FILE"
+
+echo "Modified remappings have been saved to: $OUTPUT_FILE"
diff --git a/contracts/scripts/ci/select_solc_version.sh b/contracts/scripts/ci/select_solc_version.sh
new file mode 100755
index 00000000000..3f7d7864ab7
--- /dev/null
+++ b/contracts/scripts/ci/select_solc_version.sh
@@ -0,0 +1,118 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+function check_chainlink_dir() {
+  local param_dir="chainlink"
+  current_dir=$(pwd)
+
+  current_base=$(basename "$current_dir")
+
+  if [[ "$current_base" != "$param_dir" ]]; then
+    >&2 echo "::error::The script must be run from the root of $param_dir directory"
+    exit 1
+  fi
+}
+
+check_chainlink_dir
+
+FILE="$1"
+
+if [[ "$#" -lt 1 ]]; then
+  echo "Detects the Solidity version of a file and selects the appropriate Solc version."
+  echo "If the version is not installed, it will be installed and selected."
+  echo "Will prefer to use the version from Foundry profile if it satisfies the version in the file."
+  echo "Usage: $0 <file>"
+  exit 1
+fi
+
+if [[ -z "$FILE" ]]; then
+  >&2 echo "::error:: File not provided."
+  exit 1
+fi
+
+extract_product() {
+    local path=$1
+
+    echo "$path" | awk -F'src/[^/]*/' '{print $2}' | cut -d'/' -f1
+}
+
+extract_pragma() {
+  local FILE=$1
+
+  if [[ -f "$FILE" ]]; then
+    SOLCVER="$(grep --no-filename '^pragma solidity' "$FILE" | cut -d' ' -f3)"
+  else
+    >&2 echo ":error::$FILE is not a file or it could not be found. Exiting."
+    return 1
+  fi
+  SOLCVER="$(echo "$SOLCVER" | sed 's/[^0-9\.^]//g')"
+  >&2 echo "::debug::Detected Solidity version in pragma: $SOLCVER"
+  echo "$SOLCVER"
+}
+
+echo "Detecting Solc version for $FILE"
+
+# Set FOUNDRY_PROFILE to the product name only if it is set; otherwise either already set value will be used or it will be empty
+PRODUCT=$(extract_product "$FILE")
+if [ -n "$PRODUCT" ]; then
+  FOUNDRY_PROFILE="$PRODUCT"
+fi
+SOLC_IN_PROFILE=$(forge config --json --root contracts | jq ".solc")
+SOLC_IN_PROFILE=$(echo "$SOLC_IN_PROFILE" | tr -d "'\"")
+echo "::debug::Detected Solidity version in profile: $SOLC_IN_PROFILE"
+
+set +e
+SOLCVER=$(extract_pragma "$FILE")
+
+if [[ $? -ne 0 ]]; then
+  echo "Error: Failed to extract the Solidity version from $FILE."
+  return 1
+fi
+
+set -e
+
+SOLCVER=$(echo "$SOLCVER" | tr -d "'\"")
+
+if [[ "$SOLC_IN_PROFILE" != "null" && -n "$SOLCVER" ]]; then
+  set +e
+  COMPAT_SOLC_VERSION=$(npx semver "$SOLC_IN_PROFILE" -r "$SOLCVER")
+  exit_code=$?
+  set -e
+  if [[ $exit_code -eq 0 && -n "$COMPAT_SOLC_VERSION" ]]; then
+    echo "::debug::Version $SOLC_IN_PROFILE satisfies the constraint $SOLCVER"
+    SOLC_TO_USE="$SOLC_IN_PROFILE"
+  else
+    echo "::debug::Version $SOLC_IN_PROFILE does not satisfy the constraint $SOLCVER"
+    SOLC_TO_USE="$SOLCVER"
+  fi
+ elif [[ "$SOLC_IN_PROFILE" != "null" && -z "$SOLCVER" ]]; then
+    >&2 echo "::error::No version found in the Solidity file. Exiting"
+    return 1
+  elif [[ "$SOLC_IN_PROFILE" == "null" && -n "$SOLCVER" ]]; then
+    echo "::debug::Using the version from the file: $SOLCVER"
+    SOLC_TO_USE="$SOLCVER"
+  else
+    >&2 echo "::error::No version found in the profile or the Solidity file."
+    return 1
+fi
+
+echo "Will use $SOLC_TO_USE"
+SOLC_TO_USE=$(echo "$SOLC_TO_USE" | tr -d "'\"")
+SOLC_TO_USE="$(echo "$SOLC_TO_USE" | sed 's/[^0-9\.]//g')"
+
+INSTALLED_VERSIONS=$(solc-select versions)
+
+if echo "$INSTALLED_VERSIONS" | grep -q "$SOLC_TO_USE"; then
+  echo "::debug::Version $SOLCVER is already installed."
+  if echo "$INSTALLED_VERSIONS" | grep "$SOLC_TO_USE" | grep -q "current"; then
+    echo "::debug::Version $SOLCVER is already selected."
+  else
+    echo "::debug::Selecting $SOLC_TO_USE"
+    solc-select use "$SOLC_TO_USE"
+  fi
+else
+  echo "::debug::Version $SOLC_TO_USE is not installed."
+  solc-select install "$SOLC_TO_USE"
+  solc-select use "$SOLC_TO_USE"
+fi
diff --git a/contracts/scripts/lcov_prune b/contracts/scripts/lcov_prune
new file mode 100755
index 00000000000..0f16715cb2e
--- /dev/null
+++ b/contracts/scripts/lcov_prune
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+if [ "$#" -ne 3 ]; then
+    >&2 echo "Usage: $0 <product_name> <input_coverage_file> <output_coverage_file>"
+    exit 1
+fi
+
+set -e
+
+product_name=$1
+input_coverage_file=$2
+output_coverage_file=$3
+
+# src/v0.8/ccip/libraries/Internal.sol
+# src/v0.8/ccip/libraries/RateLimiter.sol
+# src/v0.8/ccip/libraries/USDPriceWith18Decimals.sol
+# src/v0.8/ccip/libraries/MerkleMultiProof.sol
+# src/v0.8/ccip/libraries/Pool.sol
+# excluded because Foundry doesn't support coverage on library files
+
+# BurnWithFromMintTokenPool is excluded because Forge doesn't seem to
+# register coverage, even though it is 100% covered.
+exclusion_list_ccip=(
+  "src/v0.8/ccip/ocr/OCR2Abstract.sol"
+  "src/v0.8/ccip/libraries/Internal.sol"
+  "src/v0.8/ccip/libraries/RateLimiter.sol"
+  "src/v0.8/ccip/libraries/USDPriceWith18Decimals.sol"
+  "src/v0.8/ccip/libraries/MerkleMultiProof.sol"
+  "src/v0.8/ccip/libraries/Pool.sol"
+  "src/v0.8/ConfirmedOwnerWithProposal.sol"
+  "src/v0.8/tests/MockV3Aggregator.sol"
+  "src/v0.8/ccip/applications/CCIPClientExample.sol"
+  "src/v0.8/ccip/pools/BurnWithFromMintTokenPool.sol"
+)
+
+exclusion_list_shared=(
+   "*/shared/*"
+)
+
+exclusion_list_common=(
+  "*/$product_name/test/*"
+  "*/vendor/*"
+)
+
+all_exclusions=()
+
+case "$product_name" in
+  "ccip")
+    all_exclusions+=("${exclusion_list_ccip[@]}")
+    ;;
+  "shared")
+  # No product-specific exclusions for shared
+  ;;
+  *)
+  ;;
+esac
+
+all_exclusions+=("${exclusion_list_common[@]}")
+
+if [ "$product_name" != "shared" ]; then
+  all_exclusions+=("${exclusion_list_shared[@]}")
+fi
+
+echo "Excluding the following files for product $product_name:"
+for exclusion in "${all_exclusions[@]}"; do
+  echo "$exclusion"
+done
+
+lcov_command="lcov --remove $input_coverage_file -o $output_coverage_file"
+
+for exclusion in "${all_exclusions[@]}"; do
+  lcov_command+=" \"$exclusion\""
+done
+
+lcov_command+=" --rc lcov_branch_coverage=1"
+
+eval $lcov_command