diff --git a/packages/azpipelines/BuildTasks/AnalyzeWithPMDTask/package-lock.json b/packages/azpipelines/BuildTasks/AnalyzeWithPMDTask/package-lock.json
index 934e2f732..b31455dc6 100644
--- a/packages/azpipelines/BuildTasks/AnalyzeWithPMDTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/AnalyzeWithPMDTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-analyzewithpmd-task",
-  "version": "7.0.4",
+  "version": "7.0.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/AnalyzeWithPMDTask/package.json b/packages/azpipelines/BuildTasks/AnalyzeWithPMDTask/package.json
index e60acc48f..1fba7c2b7 100644
--- a/packages/azpipelines/BuildTasks/AnalyzeWithPMDTask/package.json
+++ b/packages/azpipelines/BuildTasks/AnalyzeWithPMDTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-analyzewithpmd-task",
   "description": "sfpowerscripts-analyzewithpmd-task",
-  "version": "7.0.4",
+  "version": "7.0.5",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "azure-devops-node-api": "^10.1.1",
     "azure-pipelines-task-lib": "^2.9.5",
     "xml2js": "^0.4.23"
diff --git a/packages/azpipelines/BuildTasks/AnalyzeWithPMDTask/task.json b/packages/azpipelines/BuildTasks/AnalyzeWithPMDTask/task.json
index 4f1583645..44d692b82 100644
--- a/packages/azpipelines/BuildTasks/AnalyzeWithPMDTask/task.json
+++ b/packages/azpipelines/BuildTasks/AnalyzeWithPMDTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 7,
         "Minor": 0,
-        "Patch": 4
+        "Patch": 5
     },
     "instanceNameFormat": "Analyze $(directory) using PMD",
     "inputs": [
diff --git a/packages/azpipelines/BuildTasks/AuthenticateOrgTaskCurrent/package-lock.json b/packages/azpipelines/BuildTasks/AuthenticateOrgTaskCurrent/package-lock.json
index 919fdcce9..f05942daa 100644
--- a/packages/azpipelines/BuildTasks/AuthenticateOrgTaskCurrent/package-lock.json
+++ b/packages/azpipelines/BuildTasks/AuthenticateOrgTaskCurrent/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-authenticateorg-task",
-  "version": "9.0.12",
+  "version": "9.0.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/AuthenticateOrgTaskCurrent/package.json b/packages/azpipelines/BuildTasks/AuthenticateOrgTaskCurrent/package.json
index 524b0d985..e592bf5f4 100644
--- a/packages/azpipelines/BuildTasks/AuthenticateOrgTaskCurrent/package.json
+++ b/packages/azpipelines/BuildTasks/AuthenticateOrgTaskCurrent/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-authenticateorg-task",
   "description": "sfpowerscripts-authenticateorg-task",
-  "version": "9.0.12",
+  "version": "9.0.13",
   "private": true,
   "repository": {
     "type": "git",
diff --git a/packages/azpipelines/BuildTasks/AuthenticateOrgTaskCurrent/task.json b/packages/azpipelines/BuildTasks/AuthenticateOrgTaskCurrent/task.json
index 9c9c86295..7c1d801f2 100644
--- a/packages/azpipelines/BuildTasks/AuthenticateOrgTaskCurrent/task.json
+++ b/packages/azpipelines/BuildTasks/AuthenticateOrgTaskCurrent/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 9,
         "Minor": 0,
-        "Patch": 12
+        "Patch": 13
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/BuildTasks/CheckoutProjectFromArtifactTask/package-lock.json b/packages/azpipelines/BuildTasks/CheckoutProjectFromArtifactTask/package-lock.json
index 6f2ad8108..ac2c122d5 100644
--- a/packages/azpipelines/BuildTasks/CheckoutProjectFromArtifactTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/CheckoutProjectFromArtifactTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-checkoutprojectfromartifact-task",
-  "version": "14.0.3",
+  "version": "14.0.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/CheckoutProjectFromArtifactTask/package.json b/packages/azpipelines/BuildTasks/CheckoutProjectFromArtifactTask/package.json
index 65d57bded..1860aa108 100644
--- a/packages/azpipelines/BuildTasks/CheckoutProjectFromArtifactTask/package.json
+++ b/packages/azpipelines/BuildTasks/CheckoutProjectFromArtifactTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-checkoutprojectfromartifact-task",
   "description": "sfpowerscripts-checkoutprojectfromartifact-task",
-  "version": "14.0.3",
+  "version": "14.0.4",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "azure-pipelines-task-lib": "^2.8.0",
     "fs-extra": "^8.1.0",
     "simple-git": "2.0.0"
diff --git a/packages/azpipelines/BuildTasks/CheckoutProjectFromArtifactTask/task.json b/packages/azpipelines/BuildTasks/CheckoutProjectFromArtifactTask/task.json
index c708aed8b..9db59a345 100644
--- a/packages/azpipelines/BuildTasks/CheckoutProjectFromArtifactTask/task.json
+++ b/packages/azpipelines/BuildTasks/CheckoutProjectFromArtifactTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 14,
         "Minor": 0,
-        "Patch": 3
+        "Patch": 4
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/BuildTasks/CreateDeltaPackageTask/package-lock.json b/packages/azpipelines/BuildTasks/CreateDeltaPackageTask/package-lock.json
index 1ff43ed82..45a018fa6 100644
--- a/packages/azpipelines/BuildTasks/CreateDeltaPackageTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/CreateDeltaPackageTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-createdeltapackage-task",
-  "version": "6.0.4",
+  "version": "6.0.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/CreateDeltaPackageTask/package.json b/packages/azpipelines/BuildTasks/CreateDeltaPackageTask/package.json
index 471084815..d09619cf2 100644
--- a/packages/azpipelines/BuildTasks/CreateDeltaPackageTask/package.json
+++ b/packages/azpipelines/BuildTasks/CreateDeltaPackageTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-createdeltapackage-task",
   "description": "sfpowerscripts-createdeltapackage-task",
-  "version": "6.0.4",
+  "version": "6.0.5",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "applicationinsights": "^1.6.0",
     "azure-pipelines-task-lib": "^2.8.0"
   }
diff --git a/packages/azpipelines/BuildTasks/CreateDeltaPackageTask/task.json b/packages/azpipelines/BuildTasks/CreateDeltaPackageTask/task.json
index 159bba91f..2165ec43d 100644
--- a/packages/azpipelines/BuildTasks/CreateDeltaPackageTask/task.json
+++ b/packages/azpipelines/BuildTasks/CreateDeltaPackageTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 6,
         "Minor": 0,
-        "Patch": 4
+        "Patch": 5
     },
     "instanceNameFormat": "Create Delta Package based on two commits",
     "inputs": [
diff --git a/packages/azpipelines/BuildTasks/CreateSourcePackageTask/package-lock.json b/packages/azpipelines/BuildTasks/CreateSourcePackageTask/package-lock.json
index b4457d2b0..c40bcda88 100644
--- a/packages/azpipelines/BuildTasks/CreateSourcePackageTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/CreateSourcePackageTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-createsourcepackage-task",
-  "version": "12.0.4",
+  "version": "12.0.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/CreateSourcePackageTask/package.json b/packages/azpipelines/BuildTasks/CreateSourcePackageTask/package.json
index dbb654718..5b1bb4b47 100644
--- a/packages/azpipelines/BuildTasks/CreateSourcePackageTask/package.json
+++ b/packages/azpipelines/BuildTasks/CreateSourcePackageTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-createsourcepackage-task",
   "description": "sfpowerscripts-createsourcepackage-task",
-  "version": "12.0.4",
+  "version": "12.0.5",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "azure-pipelines-task-lib": "^2.8.0",
     "fs-extra": "^8.1.0"
   }
diff --git a/packages/azpipelines/BuildTasks/CreateSourcePackageTask/task.json b/packages/azpipelines/BuildTasks/CreateSourcePackageTask/task.json
index 52a78c309..fdc5585c3 100644
--- a/packages/azpipelines/BuildTasks/CreateSourcePackageTask/task.json
+++ b/packages/azpipelines/BuildTasks/CreateSourcePackageTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 12,
         "Minor": 0,
-        "Patch": 4
+        "Patch": 5
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/BuildTasks/CreateUnlockedPackageTask/package-lock.json b/packages/azpipelines/BuildTasks/CreateUnlockedPackageTask/package-lock.json
index 4e0caf75b..2e9f2a2c4 100644
--- a/packages/azpipelines/BuildTasks/CreateUnlockedPackageTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/CreateUnlockedPackageTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-createunlockedpackage-task",
-  "version": "12.0.3",
+  "version": "12.0.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/CreateUnlockedPackageTask/package.json b/packages/azpipelines/BuildTasks/CreateUnlockedPackageTask/package.json
index c945395ca..583125ca9 100644
--- a/packages/azpipelines/BuildTasks/CreateUnlockedPackageTask/package.json
+++ b/packages/azpipelines/BuildTasks/CreateUnlockedPackageTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-createunlockedpackage-task",
   "description": "sfpowerscripts-createunlockedpackage-task",
-  "version": "12.0.3",
+  "version": "12.0.4",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "azure-pipelines-task-lib": "^2.8.0"
   }
 }
diff --git a/packages/azpipelines/BuildTasks/CreateUnlockedPackageTask/task.json b/packages/azpipelines/BuildTasks/CreateUnlockedPackageTask/task.json
index b5a79bb7b..1a143f39e 100644
--- a/packages/azpipelines/BuildTasks/CreateUnlockedPackageTask/task.json
+++ b/packages/azpipelines/BuildTasks/CreateUnlockedPackageTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 12,
         "Minor": 0,
-        "Patch": 3
+        "Patch": 4
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/BuildTasks/DeployDestructiveManifestToOrgTask/package-lock.json b/packages/azpipelines/BuildTasks/DeployDestructiveManifestToOrgTask/package-lock.json
index ca90051e5..5b9dc6ddf 100644
--- a/packages/azpipelines/BuildTasks/DeployDestructiveManifestToOrgTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/DeployDestructiveManifestToOrgTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-deploydestructivemanifesttoorg-task",
-  "version": "5.0.9",
+  "version": "5.0.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/DeployDestructiveManifestToOrgTask/package.json b/packages/azpipelines/BuildTasks/DeployDestructiveManifestToOrgTask/package.json
index 92fdeb6f8..39954b52d 100644
--- a/packages/azpipelines/BuildTasks/DeployDestructiveManifestToOrgTask/package.json
+++ b/packages/azpipelines/BuildTasks/DeployDestructiveManifestToOrgTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-deploydestructivemanifesttoorg-task",
   "description": "sfpowerscripts-deploydestructivemanifesttoorg-task",
-  "version": "5.0.9",
+  "version": "5.0.10",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "azure-pipelines-task-lib": "^2.8.0",
     "rimraf": "^3.0.0"
   }
diff --git a/packages/azpipelines/BuildTasks/DeployDestructiveManifestToOrgTask/task.json b/packages/azpipelines/BuildTasks/DeployDestructiveManifestToOrgTask/task.json
index e4f54cd99..d844d7c37 100644
--- a/packages/azpipelines/BuildTasks/DeployDestructiveManifestToOrgTask/task.json
+++ b/packages/azpipelines/BuildTasks/DeployDestructiveManifestToOrgTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 5,
         "Minor": 0,
-        "Patch": 9
+        "Patch": 10
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/BuildTasks/DeploySourceToOrgTask/package-lock.json b/packages/azpipelines/BuildTasks/DeploySourceToOrgTask/package-lock.json
index f09314065..c7f551a3e 100644
--- a/packages/azpipelines/BuildTasks/DeploySourceToOrgTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/DeploySourceToOrgTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-deploysourcetoorg-task",
-  "version": "10.0.3",
+  "version": "10.0.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/DeploySourceToOrgTask/package.json b/packages/azpipelines/BuildTasks/DeploySourceToOrgTask/package.json
index 1afda48bd..5768209ec 100644
--- a/packages/azpipelines/BuildTasks/DeploySourceToOrgTask/package.json
+++ b/packages/azpipelines/BuildTasks/DeploySourceToOrgTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-deploysourcetoorg-task",
   "description": "sfpowerscripts-deploysourcetoorg-task",
-  "version": "10.0.3",
+  "version": "10.0.4",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "azure-pipelines-task-lib": "^2.8.0",
     "rimraf": "^3.0.0"
   }
diff --git a/packages/azpipelines/BuildTasks/DeploySourceToOrgTask/task.json b/packages/azpipelines/BuildTasks/DeploySourceToOrgTask/task.json
index 43e673f1e..eb8800e39 100644
--- a/packages/azpipelines/BuildTasks/DeploySourceToOrgTask/task.json
+++ b/packages/azpipelines/BuildTasks/DeploySourceToOrgTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 10,
         "Minor": 0,
-        "Patch": 3
+        "Patch": 4
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/BuildTasks/ExportSourceFromAnOrgTask/package-lock.json b/packages/azpipelines/BuildTasks/ExportSourceFromAnOrgTask/package-lock.json
index cbaac85d7..e9fbfa14a 100644
--- a/packages/azpipelines/BuildTasks/ExportSourceFromAnOrgTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/ExportSourceFromAnOrgTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-exportsourcefromorg-task",
-  "version": "3.0.12",
+  "version": "3.0.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/ExportSourceFromAnOrgTask/package.json b/packages/azpipelines/BuildTasks/ExportSourceFromAnOrgTask/package.json
index cbc2f3405..16ee2448e 100644
--- a/packages/azpipelines/BuildTasks/ExportSourceFromAnOrgTask/package.json
+++ b/packages/azpipelines/BuildTasks/ExportSourceFromAnOrgTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-exportsourcefromorg-task",
   "description": "sfpowerscripts-exportsourcefromorg-task",
-  "version": "3.0.12",
+  "version": "3.0.13",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "applicationinsights": "^1.6.0",
     "azure-pipelines-task-lib": "^2.8.0"
   }
diff --git a/packages/azpipelines/BuildTasks/ExportSourceFromAnOrgTask/task.json b/packages/azpipelines/BuildTasks/ExportSourceFromAnOrgTask/task.json
index 783fbe09d..9a6d10e5a 100644
--- a/packages/azpipelines/BuildTasks/ExportSourceFromAnOrgTask/task.json
+++ b/packages/azpipelines/BuildTasks/ExportSourceFromAnOrgTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 3,
         "Minor": 0,
-        "Patch": 12
+        "Patch": 13
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/BuildTasks/GenerateChangelogTask/package-lock.json b/packages/azpipelines/BuildTasks/GenerateChangelogTask/package-lock.json
index 343c25251..04651a8d7 100644
--- a/packages/azpipelines/BuildTasks/GenerateChangelogTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/GenerateChangelogTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-generatechangelog-task",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/GenerateChangelogTask/package.json b/packages/azpipelines/BuildTasks/GenerateChangelogTask/package.json
index 722fdf0f7..1504b1b63 100644
--- a/packages/azpipelines/BuildTasks/GenerateChangelogTask/package.json
+++ b/packages/azpipelines/BuildTasks/GenerateChangelogTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-generatechangelog-task",
   "description": "sfpowerscripts-generatechangelog-task",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "azure-devops-node-api": "^10.1.1",
     "azure-pipelines-task-lib": "^2.8.0",
     "glob": "^7.1.6",
diff --git a/packages/azpipelines/BuildTasks/GenerateChangelogTask/task.json b/packages/azpipelines/BuildTasks/GenerateChangelogTask/task.json
index 3668a7158..3ef71917d 100644
--- a/packages/azpipelines/BuildTasks/GenerateChangelogTask/task.json
+++ b/packages/azpipelines/BuildTasks/GenerateChangelogTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 4
+        "Patch": 5
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/BuildTasks/IncrementProjectBuildNumberTask/package-lock.json b/packages/azpipelines/BuildTasks/IncrementProjectBuildNumberTask/package-lock.json
index fc9f164fa..5e317ce12 100644
--- a/packages/azpipelines/BuildTasks/IncrementProjectBuildNumberTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/IncrementProjectBuildNumberTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-incrementprojectbuildnumber-task",
-  "version": "9.0.12",
+  "version": "9.0.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/IncrementProjectBuildNumberTask/package.json b/packages/azpipelines/BuildTasks/IncrementProjectBuildNumberTask/package.json
index 528ba0cdc..5a319f7c6 100644
--- a/packages/azpipelines/BuildTasks/IncrementProjectBuildNumberTask/package.json
+++ b/packages/azpipelines/BuildTasks/IncrementProjectBuildNumberTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-incrementprojectbuildnumber-task",
   "description": "sfpowerscripts-incrementprojectbuildnumber-task",
-  "version": "9.0.12",
+  "version": "9.0.13",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "azure-pipelines-task-lib": "^2.8.0",
     "simple-git": "^1.126.0"
   }
diff --git a/packages/azpipelines/BuildTasks/IncrementProjectBuildNumberTask/task.json b/packages/azpipelines/BuildTasks/IncrementProjectBuildNumberTask/task.json
index 6b91216b1..4db1f9bd2 100644
--- a/packages/azpipelines/BuildTasks/IncrementProjectBuildNumberTask/task.json
+++ b/packages/azpipelines/BuildTasks/IncrementProjectBuildNumberTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 9,
         "Minor": 0,
-        "Patch": 12
+        "Patch": 13
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/BuildTasks/InstallPackageDependenciesTask/package-lock.json b/packages/azpipelines/BuildTasks/InstallPackageDependenciesTask/package-lock.json
index 1314471d0..bbe2683e3 100644
--- a/packages/azpipelines/BuildTasks/InstallPackageDependenciesTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/InstallPackageDependenciesTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-installpackagedependencies-task",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/InstallPackageDependenciesTask/package.json b/packages/azpipelines/BuildTasks/InstallPackageDependenciesTask/package.json
index 2d216ca39..802434e9d 100644
--- a/packages/azpipelines/BuildTasks/InstallPackageDependenciesTask/package.json
+++ b/packages/azpipelines/BuildTasks/InstallPackageDependenciesTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-installpackagedependencies-task",
   "description": "sfpowerscripts-installpackagedependencies-task",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "azure-pipelines-task-lib": "^2.8.0"
   }
 }
diff --git a/packages/azpipelines/BuildTasks/InstallPackageDependenciesTask/task.json b/packages/azpipelines/BuildTasks/InstallPackageDependenciesTask/task.json
index b2e10d438..be26bbb47 100644
--- a/packages/azpipelines/BuildTasks/InstallPackageDependenciesTask/task.json
+++ b/packages/azpipelines/BuildTasks/InstallPackageDependenciesTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 5,
         "Minor": 0,
-        "Patch": 3
+        "Patch": 4
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/BuildTasks/InstallSFDXCLITaskCurrent/package-lock.json b/packages/azpipelines/BuildTasks/InstallSFDXCLITaskCurrent/package-lock.json
index da6e6ee6b..ddcfd3b75 100644
--- a/packages/azpipelines/BuildTasks/InstallSFDXCLITaskCurrent/package-lock.json
+++ b/packages/azpipelines/BuildTasks/InstallSFDXCLITaskCurrent/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-installsfdx-task",
-  "version": "7.0.12",
+  "version": "7.0.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/InstallSFDXCLITaskCurrent/package.json b/packages/azpipelines/BuildTasks/InstallSFDXCLITaskCurrent/package.json
index fcd93326f..9e5f302c1 100644
--- a/packages/azpipelines/BuildTasks/InstallSFDXCLITaskCurrent/package.json
+++ b/packages/azpipelines/BuildTasks/InstallSFDXCLITaskCurrent/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-installsfdx-task",
   "description": "Install SFDX CLI Task",
-  "version": "7.0.12",
+  "version": "7.0.13",
   "private": true,
   "repository": {
     "type": "git",
diff --git a/packages/azpipelines/BuildTasks/InstallSFDXCLITaskCurrent/task.json b/packages/azpipelines/BuildTasks/InstallSFDXCLITaskCurrent/task.json
index 9f343d67d..db155946b 100644
--- a/packages/azpipelines/BuildTasks/InstallSFDXCLITaskCurrent/task.json
+++ b/packages/azpipelines/BuildTasks/InstallSFDXCLITaskCurrent/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 7,
         "Minor": 0,
-        "Patch": 12
+        "Patch": 13
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/BuildTasks/InstallSourcePackageTask/package-lock.json b/packages/azpipelines/BuildTasks/InstallSourcePackageTask/package-lock.json
index 211bd0f9e..06df5311b 100644
--- a/packages/azpipelines/BuildTasks/InstallSourcePackageTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/InstallSourcePackageTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscript-installsourcepackage-task",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/InstallSourcePackageTask/package.json b/packages/azpipelines/BuildTasks/InstallSourcePackageTask/package.json
index 37dc9c567..7d599dcfa 100644
--- a/packages/azpipelines/BuildTasks/InstallSourcePackageTask/package.json
+++ b/packages/azpipelines/BuildTasks/InstallSourcePackageTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscript-installsourcepackage-task",
   "description": "sfpowerscript-installsourcepackage-task",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "azure-devops-node-api": "^10.1.1",
     "azure-pipelines-task-lib": "^2.8.0",
     "fs-extra": "^8.1.0",
diff --git a/packages/azpipelines/BuildTasks/InstallSourcePackageTask/task.json b/packages/azpipelines/BuildTasks/InstallSourcePackageTask/task.json
index 214cef19f..b0339285a 100644
--- a/packages/azpipelines/BuildTasks/InstallSourcePackageTask/task.json
+++ b/packages/azpipelines/BuildTasks/InstallSourcePackageTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 6
+        "Patch": 7
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/BuildTasks/InstallUnlockedPackageTask/package-lock.json b/packages/azpipelines/BuildTasks/InstallUnlockedPackageTask/package-lock.json
index 018d9b708..5b1f38b2e 100644
--- a/packages/azpipelines/BuildTasks/InstallUnlockedPackageTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/InstallUnlockedPackageTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-installunlockedpackage-task",
-  "version": "11.0.3",
+  "version": "11.0.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/InstallUnlockedPackageTask/package.json b/packages/azpipelines/BuildTasks/InstallUnlockedPackageTask/package.json
index 8ceae8de4..28156ebfb 100644
--- a/packages/azpipelines/BuildTasks/InstallUnlockedPackageTask/package.json
+++ b/packages/azpipelines/BuildTasks/InstallUnlockedPackageTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-installunlockedpackage-task",
   "description": "sfpowerscripts-installunlockedpackage-task",
-  "version": "11.0.3",
+  "version": "11.0.4",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "azure-devops-node-api": "^10.1.1",
     "azure-pipelines-task-lib": "^2.8.0"
   }
diff --git a/packages/azpipelines/BuildTasks/InstallUnlockedPackageTask/task.json b/packages/azpipelines/BuildTasks/InstallUnlockedPackageTask/task.json
index e519fe8be..16b82a798 100644
--- a/packages/azpipelines/BuildTasks/InstallUnlockedPackageTask/task.json
+++ b/packages/azpipelines/BuildTasks/InstallUnlockedPackageTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 11,
         "Minor": 0,
-        "Patch": 3
+        "Patch": 4
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/BuildTasks/ManageScratchOrgTaskCurrent/package-lock.json b/packages/azpipelines/BuildTasks/ManageScratchOrgTaskCurrent/package-lock.json
index 1f1eefba7..86eaa132c 100644
--- a/packages/azpipelines/BuildTasks/ManageScratchOrgTaskCurrent/package-lock.json
+++ b/packages/azpipelines/BuildTasks/ManageScratchOrgTaskCurrent/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-managescratchorg-task",
-  "version": "8.0.13",
+  "version": "8.0.14",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/ManageScratchOrgTaskCurrent/package.json b/packages/azpipelines/BuildTasks/ManageScratchOrgTaskCurrent/package.json
index cecedad57..9061c97ef 100644
--- a/packages/azpipelines/BuildTasks/ManageScratchOrgTaskCurrent/package.json
+++ b/packages/azpipelines/BuildTasks/ManageScratchOrgTaskCurrent/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-managescratchorg-task",
   "description": "Creates/Deletes a Scratch Org",
-  "version": "8.0.13",
+  "version": "8.0.14",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "azure-pipelines-task-lib": "^2.8.0"
   }
 }
diff --git a/packages/azpipelines/BuildTasks/ManageScratchOrgTaskCurrent/task.json b/packages/azpipelines/BuildTasks/ManageScratchOrgTaskCurrent/task.json
index a34460c28..d2b65edc4 100644
--- a/packages/azpipelines/BuildTasks/ManageScratchOrgTaskCurrent/task.json
+++ b/packages/azpipelines/BuildTasks/ManageScratchOrgTaskCurrent/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 8,
         "Minor": 0,
-        "Patch": 13
+        "Patch": 14
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/BuildTasks/PostPackageCreateTask/package-lock.json b/packages/azpipelines/BuildTasks/PostPackageCreateTask/package-lock.json
index 311b6f53e..d8bbb756e 100644
--- a/packages/azpipelines/BuildTasks/PostPackageCreateTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/PostPackageCreateTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-postcreatepackage-task",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/PostPackageCreateTask/package.json b/packages/azpipelines/BuildTasks/PostPackageCreateTask/package.json
index 9567cafa4..7ef98585a 100644
--- a/packages/azpipelines/BuildTasks/PostPackageCreateTask/package.json
+++ b/packages/azpipelines/BuildTasks/PostPackageCreateTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-postcreatepackage-task",
   "description": "sfpowerscripts-postcreatepackage-task",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "private": true,
   "repository": {
     "type": "git",
diff --git a/packages/azpipelines/BuildTasks/PostPackageCreateTask/task.json b/packages/azpipelines/BuildTasks/PostPackageCreateTask/task.json
index 71d4fce64..ec8d5c037 100644
--- a/packages/azpipelines/BuildTasks/PostPackageCreateTask/task.json
+++ b/packages/azpipelines/BuildTasks/PostPackageCreateTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 10
+        "Patch": 11
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/BuildTasks/PromoteUnlockedPackageTask/package-lock.json b/packages/azpipelines/BuildTasks/PromoteUnlockedPackageTask/package-lock.json
index 4d4c31dd2..22c2c3283 100644
--- a/packages/azpipelines/BuildTasks/PromoteUnlockedPackageTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/PromoteUnlockedPackageTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-promoteunlocked-task",
-  "version": "8.0.3",
+  "version": "8.0.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/PromoteUnlockedPackageTask/package.json b/packages/azpipelines/BuildTasks/PromoteUnlockedPackageTask/package.json
index 16432780b..f5dcbae3d 100644
--- a/packages/azpipelines/BuildTasks/PromoteUnlockedPackageTask/package.json
+++ b/packages/azpipelines/BuildTasks/PromoteUnlockedPackageTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-promoteunlocked-task",
   "description": "sfpowerscripts-promoteunlocked-task",
-  "version": "8.0.3",
+  "version": "8.0.4",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "azure-pipelines-task-lib": "^2.8.0"
   }
 }
diff --git a/packages/azpipelines/BuildTasks/PromoteUnlockedPackageTask/task.json b/packages/azpipelines/BuildTasks/PromoteUnlockedPackageTask/task.json
index 45682e638..79ff31964 100644
--- a/packages/azpipelines/BuildTasks/PromoteUnlockedPackageTask/task.json
+++ b/packages/azpipelines/BuildTasks/PromoteUnlockedPackageTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 8,
         "Minor": 0,
-        "Patch": 3
+        "Patch": 4
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/BuildTasks/TriggerApexTestTask/package-lock.json b/packages/azpipelines/BuildTasks/TriggerApexTestTask/package-lock.json
index c2c6e748c..4db22bf5e 100644
--- a/packages/azpipelines/BuildTasks/TriggerApexTestTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/TriggerApexTestTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-triggerapextest-task",
-  "version": "9.0.1",
+  "version": "9.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/TriggerApexTestTask/package.json b/packages/azpipelines/BuildTasks/TriggerApexTestTask/package.json
index 817fd7754..ef9fce71e 100644
--- a/packages/azpipelines/BuildTasks/TriggerApexTestTask/package.json
+++ b/packages/azpipelines/BuildTasks/TriggerApexTestTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-triggerapextest-task",
   "description": "sfpowerscripts-triggerapextest-task",
-  "version": "9.0.1",
+  "version": "9.0.2",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "azure-pipelines-task-lib": "^2.8.0",
     "fs-extra": "^8.1.0"
   }
diff --git a/packages/azpipelines/BuildTasks/TriggerApexTestTask/task.json b/packages/azpipelines/BuildTasks/TriggerApexTestTask/task.json
index ac2283ead..8c5d263f8 100644
--- a/packages/azpipelines/BuildTasks/TriggerApexTestTask/task.json
+++ b/packages/azpipelines/BuildTasks/TriggerApexTestTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 9,
         "Minor": 0,
-        "Patch": 1
+        "Patch": 2
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/BuildTasks/ValidateApexCoverageTask/package-lock.json b/packages/azpipelines/BuildTasks/ValidateApexCoverageTask/package-lock.json
index f7827b114..96063fbbd 100644
--- a/packages/azpipelines/BuildTasks/ValidateApexCoverageTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/ValidateApexCoverageTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-validateapextestcoverage-task",
-  "version": "4.0.12",
+  "version": "4.0.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/ValidateApexCoverageTask/package.json b/packages/azpipelines/BuildTasks/ValidateApexCoverageTask/package.json
index dc9d71446..75db293b5 100644
--- a/packages/azpipelines/BuildTasks/ValidateApexCoverageTask/package.json
+++ b/packages/azpipelines/BuildTasks/ValidateApexCoverageTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-validateapextestcoverage-task",
   "description": "sfpowerscripts-validateapextestcoverage-task",
-  "version": "4.0.12",
+  "version": "4.0.13",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "azure-pipelines-task-lib": "^2.8.0"
   }
 }
diff --git a/packages/azpipelines/BuildTasks/ValidateApexCoverageTask/task.json b/packages/azpipelines/BuildTasks/ValidateApexCoverageTask/task.json
index 02abfecbd..ec0a99c4b 100644
--- a/packages/azpipelines/BuildTasks/ValidateApexCoverageTask/task.json
+++ b/packages/azpipelines/BuildTasks/ValidateApexCoverageTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 4,
         "Minor": 0,
-        "Patch": 12
+        "Patch": 13
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/BuildTasks/ValidateDXUnlockedPackageTask/package-lock.json b/packages/azpipelines/BuildTasks/ValidateDXUnlockedPackageTask/package-lock.json
index 5e3bf2e0f..0f67f005a 100644
--- a/packages/azpipelines/BuildTasks/ValidateDXUnlockedPackageTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/ValidateDXUnlockedPackageTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-validatedxunlockedpackage-task",
-  "version": "4.0.12",
+  "version": "4.0.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/ValidateDXUnlockedPackageTask/package.json b/packages/azpipelines/BuildTasks/ValidateDXUnlockedPackageTask/package.json
index 7caa95d67..a59630a13 100644
--- a/packages/azpipelines/BuildTasks/ValidateDXUnlockedPackageTask/package.json
+++ b/packages/azpipelines/BuildTasks/ValidateDXUnlockedPackageTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-validatedxunlockedpackage-task",
   "description": "sfpowerscripts-validatedxunlockedpackage-task",
-  "version": "4.0.12",
+  "version": "4.0.13",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "azure-pipelines-task-lib": "^2.8.0"
   }
 }
diff --git a/packages/azpipelines/BuildTasks/ValidateDXUnlockedPackageTask/task.json b/packages/azpipelines/BuildTasks/ValidateDXUnlockedPackageTask/task.json
index 97ec0f481..34a4a46cf 100644
--- a/packages/azpipelines/BuildTasks/ValidateDXUnlockedPackageTask/task.json
+++ b/packages/azpipelines/BuildTasks/ValidateDXUnlockedPackageTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 4,
         "Minor": 0,
-        "Patch": 12
+        "Patch": 13
     },
     "instanceNameFormat": "Validates $(package) for MetadataCoverage",
     "inputs": [
diff --git a/packages/azpipelines/BuildTasks/ValidateTestCoveragePackageTask/package-lock.json b/packages/azpipelines/BuildTasks/ValidateTestCoveragePackageTask/package-lock.json
index 6ccd8f04a..cf8472a2e 100644
--- a/packages/azpipelines/BuildTasks/ValidateTestCoveragePackageTask/package-lock.json
+++ b/packages/azpipelines/BuildTasks/ValidateTestCoveragePackageTask/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sfpowerscripts-validatetestcoverage-task",
-  "version": "4.0.13",
+  "version": "4.0.14",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/BuildTasks/ValidateTestCoveragePackageTask/package.json b/packages/azpipelines/BuildTasks/ValidateTestCoveragePackageTask/package.json
index b058e0b7a..e2f74fd22 100644
--- a/packages/azpipelines/BuildTasks/ValidateTestCoveragePackageTask/package.json
+++ b/packages/azpipelines/BuildTasks/ValidateTestCoveragePackageTask/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sfpowerscripts-validatetestcoverage-task",
   "description": "sfpowerscripts-validatetestcoverage-task",
-  "version": "4.0.13",
+  "version": "4.0.14",
   "private": true,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "azure-pipelines-task-lib": "^2.8.0"
   }
 }
diff --git a/packages/azpipelines/BuildTasks/ValidateTestCoveragePackageTask/task.json b/packages/azpipelines/BuildTasks/ValidateTestCoveragePackageTask/task.json
index ad4b8693a..194868ef3 100644
--- a/packages/azpipelines/BuildTasks/ValidateTestCoveragePackageTask/task.json
+++ b/packages/azpipelines/BuildTasks/ValidateTestCoveragePackageTask/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 4,
         "Minor": 0,
-        "Patch": 13
+        "Patch": 14
     },
     "runsOn": [
         "Agent"
diff --git a/packages/azpipelines/package-lock.json b/packages/azpipelines/package-lock.json
index 39213f930..cfd34718c 100644
--- a/packages/azpipelines/package-lock.json
+++ b/packages/azpipelines/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@dxatscale/sfpowerscripts.azpipelines",
-  "version": "17.1.4",
+  "version": "17.1.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/azpipelines/package.json b/packages/azpipelines/package.json
index ca4a0c2c6..87e3be3e2 100644
--- a/packages/azpipelines/package.json
+++ b/packages/azpipelines/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dxatscale/sfpowerscripts.azpipelines",
   "private": true,
-  "version": "17.1.4",
+  "version": "17.1.5",
   "description": "CI/CD extensions for Salesforce",
   "repository": {
     "type": "git",
diff --git a/packages/azpipelines/vss-extension.json b/packages/azpipelines/vss-extension.json
index a9fad2214..666b966e3 100644
--- a/packages/azpipelines/vss-extension.json
+++ b/packages/azpipelines/vss-extension.json
@@ -3,7 +3,7 @@
     "id": "sfpowerscripts",
     "publisher": "AzlamSalam",
     "name": "sfpowerscripts",
-    "version": "17.1.4",
+    "version": "17.1.5",
     "description": "Azure Pipelines tasks for working with Salesforce",
     "tags": [
         "Extension",
diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json
index 2d1494e73..bce3bbd28 100644
--- a/packages/core/package-lock.json
+++ b/packages/core/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dxatscale/sfpowerscripts.core",
-	"version": "2.1.3",
+	"version": "2.1.4",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
diff --git a/packages/core/package.json b/packages/core/package.json
index 2d001cc94..ca411cc0d 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dxatscale/sfpowerscripts.core",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Core Module used by sfpowerscripts",
   "main": "lib/index",
   "types": "lib/index",
diff --git a/packages/core/src/sfdxwrappers/TriggerApexTestImpl.ts b/packages/core/src/sfdxwrappers/TriggerApexTestImpl.ts
index 913c307ac..560e4add7 100644
--- a/packages/core/src/sfdxwrappers/TriggerApexTestImpl.ts
+++ b/packages/core/src/sfdxwrappers/TriggerApexTestImpl.ts
@@ -6,6 +6,7 @@ import path = require("path");
 import MDAPIPackageGenerator from "../generators/MDAPIPackageGenerator";
 import ApexTypeFetcher, { ApexSortedByType } from "../parser/ApexTypeFetcher";
 import ManifestHelpers from "../manifest/ManifestHelpers";
+const Table = require("cli-table");
 
 export default class TriggerApexTestImpl {
   private packageDescriptor;
@@ -52,8 +53,14 @@ export default class TriggerApexTestImpl {
       await onExit(child);
 
     } catch (err) {
-        if (err.message === "Package or package directory does not exist") {
-          console.log(err.message);
+        if (
+          err.message === "Package or package directory does not exist" ||
+          err.message === "No test classes found in package"
+        ) {
+          // Terminate execution without running command
+          test_result.result = false;
+          test_result.message = err.message;
+          return test_result;
         }
     } finally {
       console.log(output);
@@ -100,18 +107,20 @@ export default class TriggerApexTestImpl {
       return test_result;
     }
 
-    let classesWithInvalidCoverage: string[];
+    let classesWithInvalidCoverage: {name: string, coveredPercent: number}[];
 
     if (this.test_options["isValidateCoverage"]) {
       classesWithInvalidCoverage = await this.validateClassCodeCoverage();
     }
 
-    if (isNullOrUndefined(classesWithInvalidCoverage) || classesWithInvalidCoverage.length == 0) {
+    if (isNullOrUndefined(classesWithInvalidCoverage) || classesWithInvalidCoverage.length === 0) {
       test_result.message = `${test_report_json.summary.passing} Tests passed with overall Test Run Coverage of ${test_report_json.summary.testRunCoverage} percent`;
       test_result.result = true;
     } else {
-      test_result.message=`The classes ${classesWithInvalidCoverage.toString()} do not meet the required code coverage of ${this.test_options["coverageThreshold"]}`;
+      test_result.message=`There are classes that do not satisfy the minimum code coverage of ${this.test_options["coverageThreshold"]}%`;
       test_result.result = false;
+
+      this.printClassesWithInvalidCoverage(classesWithInvalidCoverage);
     }
     return test_result;
   }
@@ -156,6 +165,10 @@ export default class TriggerApexTestImpl {
         fileDescriptor.name
       );
 
+      if (testClassNames.length === 0) {
+        throw new Error("No test classes found in package");
+      }
+
       command += ` -t ${testClassNames.toString()}`;
     }
     else if (this.test_options["testlevel"] == "RunApexTestSuite") {
@@ -166,9 +179,9 @@ export default class TriggerApexTestImpl {
     return command;
   }
 
-  private async validateClassCodeCoverage(): Promise<string[]>  {
+  private async validateClassCodeCoverage(): Promise<{name: string, coveredPercent: number}[]>  {
     console.log(`Validating individual classes for code coverage greater than ${this.test_options["coverageThreshold"]} percent`);
-    let classesWithInvalidCoverage: string[] = [];
+    let classesWithInvalidCoverage: {name: string, coveredPercent: number}[] = [];
 
     let mdapiPackage: {mdapiDir: string, manifest} = await MDAPIPackageGenerator.getMDAPIPackageFromSourceDirectory(
       this.project_directory,
@@ -195,12 +208,12 @@ export default class TriggerApexTestImpl {
         classCoverage["coveredPercent"] !== null &&
         classCoverage["coveredPercent"] < this.test_options["coverageThreshold"]
       ) {
-        classesWithInvalidCoverage.push(classCoverage["name"]);
+        classesWithInvalidCoverage.push({name: classCoverage["name"], coveredPercent: classCoverage["coveredPercent"]});
       }
     }
 
     // Check for package classes with no test class
-    let classesWithoutTest: string[] = packageClasses.filter( (packageClass) => {
+    let namesOfClassesWithoutTest: string[] = packageClasses.filter( (packageClass) => {
       // Filter out package class if accounted for in coverage json
       for (let classCoverage of code_coverage_json) {
         if (classCoverage["name"] === packageClass) {
@@ -211,7 +224,11 @@ export default class TriggerApexTestImpl {
     });
 
 
-    if (classesWithoutTest.length > 0) {
+    if (namesOfClassesWithoutTest.length > 0) {
+      let classesWithoutTest: {name: string, coveredPercent: number}[] = namesOfClassesWithoutTest.map(
+        (className) => {
+        return {name: className, coveredPercent: 0};
+      });
       classesWithInvalidCoverage = classesWithInvalidCoverage.concat(classesWithoutTest);
     }
 
@@ -335,4 +352,16 @@ export default class TriggerApexTestImpl {
 
     return packageClasses;
   }
+
+  private printClassesWithInvalidCoverage(classesWithInvalidCoverage: {name: string, coveredPercent: number}[]) {
+    let table = new Table({
+      head: ["Class", "Coverage Percent"],
+    });
+
+    classesWithInvalidCoverage.forEach( (classWithInvalidCoverage) => {
+      table.push([classWithInvalidCoverage.name, classWithInvalidCoverage.coveredPercent]);
+    })
+    console.log(`The following classes do not satisfy the ${this.test_options["coverageThreshold"]}% code coverage requirement:`);
+    console.log(table.toString());
+  }
 }
diff --git a/packages/sfpowerscripts-cli/package-lock.json b/packages/sfpowerscripts-cli/package-lock.json
index c3e7a34bf..8ffd36062 100644
--- a/packages/sfpowerscripts-cli/package-lock.json
+++ b/packages/sfpowerscripts-cli/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dxatscale/sfpowerscripts",
-	"version": "0.13.5",
+	"version": "0.13.6",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
diff --git a/packages/sfpowerscripts-cli/package.json b/packages/sfpowerscripts-cli/package.json
index 76e52b623..ca225ebec 100644
--- a/packages/sfpowerscripts-cli/package.json
+++ b/packages/sfpowerscripts-cli/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@dxatscale/sfpowerscripts",
   "description": "Simple wrappers around sfdx commands to help set up CI/CD quickly",
-  "version": "0.13.5",
+  "version": "0.13.6",
   "author": "dxatscale",
   "bin": {
     "readVars": "./scripts/readVars.sh"
   },
   "bugs": "https://github.com/Accenture/sfpowerscripts/issues",
   "dependencies": {
-    "@dxatscale/sfpowerscripts.core": "^2.1.3",
+    "@dxatscale/sfpowerscripts.core": "^2.1.4",
     "@oclif/command": "^1",
     "@oclif/config": "^1",
     "@oclif/errors": "^1",