diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index c7dae6adb..c79628ea1 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -3,6 +3,8 @@ name: CodeQL Analysis
 on:
   pull_request:
   push:
+   branches:
+     - development
 
 jobs:
   code-ql-analysis:
diff --git a/.github/workflows/core-contracts-storage-check.yml b/.github/workflows/core-contracts-storage-check.yml
index 01db6bfff..a7b2cc2b3 100644
--- a/.github/workflows/core-contracts-storage-check.yml
+++ b/.github/workflows/core-contracts-storage-check.yml
@@ -20,10 +20,24 @@ jobs:
         with:
           version: nightly
 
-      - id: set-matrix
+      - name: Narrow down test matrix scope to changed contracts to limit API requests
+        id: changed-contracts
+        uses: tj-actions/changed-files@v42
+        with:
+          files_yaml: |
+            contracts:
+              - packages/contracts/src/dollar/core/*.sol
+
+      - name: Set contracts matrix
+        id: set-matrix
         working-directory: packages/contracts
+        if: steps.changed-contracts.outputs.contracts_any_changed == 'true'
+        env:
+          CHANGED_CONTRACTS: ${{ steps.changed-contracts.outputs.contracts_all_changed_files }}
         run: |
-          forge tree | grep -E '^src/dollar/core' | cut -d' ' -f1 | xargs basename -s | cut -d'.' -f1 | xargs -I{} echo src/dollar/core/{}.sol:{} >> contracts.txt
+          for CONTRACT in "$CHANGED_CONTRACTS"; do
+            echo ${CONTRACT} | xargs basename -a | cut -d'.' -f1 | xargs -I{} echo src/dollar/core/{}.sol:{} >> contracts.txt
+          done
           echo "matrix=$(cat contracts.txt | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
 
     outputs:
diff --git a/packages/contracts/src/dollar/core/StakingShare.sol b/packages/contracts/src/dollar/core/StakingShare.sol
index 98482a8b4..28d9deb08 100644
--- a/packages/contracts/src/dollar/core/StakingShare.sol
+++ b/packages/contracts/src/dollar/core/StakingShare.sol
@@ -26,6 +26,7 @@ contract StakingShare is ERC1155Ubiquity, ERC1155URIStorageUpgradeable {
         uint256 endBlock;
         // lp remaining for a user
         uint256 lpAmount;
+        uint256 safeChange;
     }
 
     /// @notice Mapping of stake id to stake info
diff --git a/packages/contracts/src/dollar/core/UbiquityCreditToken.sol b/packages/contracts/src/dollar/core/UbiquityCreditToken.sol
index 021438b08..3521dd7e4 100644
--- a/packages/contracts/src/dollar/core/UbiquityCreditToken.sol
+++ b/packages/contracts/src/dollar/core/UbiquityCreditToken.sol
@@ -25,6 +25,7 @@ contract UbiquityCreditToken is ERC20Ubiquity {
 
     // ----------- Modifiers -----------
 
+    // comment added
     /// @notice Modifier checks that the method is called by a user with the "Credit minter" role
     modifier onlyCreditMinter() {
         require(
diff --git a/packages/contracts/src/dollar/interfaces/IBondingCurve.sol b/packages/contracts/src/dollar/interfaces/IBondingCurve.sol
index 40dfaf9bd..8c8216c9c 100644
--- a/packages/contracts/src/dollar/interfaces/IBondingCurve.sol
+++ b/packages/contracts/src/dollar/interfaces/IBondingCurve.sol
@@ -14,6 +14,8 @@ interface IBondingCurve {
      */
     function setParams(uint32 _connectorWeight, uint256 _baseY) external;
 
+    // interface comment added
+
     /**
      * @notice Returns `connectorWeight` value
      * @return Connector weight value
diff --git a/packages/contracts/src/dollar/libraries/LibStaking.sol b/packages/contracts/src/dollar/libraries/LibStaking.sol
index d8e5b93b3..3fa329ca6 100644
--- a/packages/contracts/src/dollar/libraries/LibStaking.sol
+++ b/packages/contracts/src/dollar/libraries/LibStaking.sol
@@ -64,6 +64,7 @@ library LibStaking {
         uint256 accLpRewardPerShare;
         uint256 lpRewards;
         uint256 totalLpToMigrate;
+        uint256 libraryStructChanged;
     }
 
     /**