diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
index 2adf007721c..511c4065e3b 100644
--- a/.github/policies/resourceManagement.yml
+++ b/.github/policies/resourceManagement.yml
@@ -5729,6 +5729,8 @@ configuration:
           reviewer: zhoxing-ms
       - requestReview:
           reviewer: yanzhudd
+      - requestReview:
+          reviewer: qwuae1
       - addLabel:
           label: Auto-Assign
       - assignTo:
diff --git a/.github/workflows/AddIssueComment.yml b/.github/workflows/AddIssueComment.yml
index 144bbb2c4de..f05623ca26d 100644
--- a/.github/workflows/AddIssueComment.yml
+++ b/.github/workflows/AddIssueComment.yml
@@ -8,7 +8,7 @@ jobs:
     name: Say thanks for the Issue
     steps:
       - name: comment on the issue
-        uses: hasura/comment-progress@v2.2.0
+        uses: hasura/comment-progress@v2.3.0
         with:
           github-token: ${{ secrets.CLI_BOT }}
           repository: 'Azure/azure-cli-extensions'
diff --git a/.github/workflows/BlockPRMerge.yml b/.github/workflows/BlockPRMerge.yml
new file mode 100644
index 00000000000..c5f9ceb6b12
--- /dev/null
+++ b/.github/workflows/BlockPRMerge.yml
@@ -0,0 +1,21 @@
+name: Block PR merging on "do-not-merge" label
+
+on:
+  pull_request_target:
+    types: [labeled, unlabeled]
+
+jobs:
+  block-merge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check "do-not-merge" label
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const labels = context.payload.pull_request.labels.map(label => label.name);
+            if (labels.includes("do-not-merge")) {
+              console.log("It is not allowed to merge a PR with 'do-not-merge' label.");
+              process.exit(1); // Exit with a non-zero status code to block merge
+            } else {
+              console.log("It is allowed to merge a PR without 'do-not-merge' label.");
+            }