diff --git a/chart/templates/mayastor/agents/core/agent-core-deployment.yaml b/chart/templates/mayastor/agents/core/agent-core-deployment.yaml
index 92b2bb930..dfa1e2ba5 100644
--- a/chart/templates/mayastor/agents/core/agent-core-deployment.yaml
+++ b/chart/templates/mayastor/agents/core/agent-core-deployment.yaml
@@ -63,6 +63,9 @@ spec:
             - "--ansi-colors={{ .Values.base.logging.color }}"
             - "--create-volume-limit={{ .Values.agents.core.maxCreateVolume }}"{{ if .Values.agents.core.maxRebuilds }}
             - "--max-rebuilds={{ .Values.agents.core.maxRebuilds }}"{{ end }}
+            {{- if .Values.agents.core.partialRebuildDisable }}
+            - "--disable-partial-rebuild"
+            {{- end }}
           ports:
             - containerPort: 50051
           env:
diff --git a/chart/values.yaml b/chart/values.yaml
index 5fa62fd8a..15e8d6d16 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -183,6 +183,8 @@ agents:
     # faster depending on the log size. Otherwise, the replica will be fully rebuilt.
     # A blank value "" means internally derived value will be used.
     partialRebuildWaitPeriod: ""
+    # Set to true to disable partial rebuilds.
+    partialRebuildDisable:
     # The maximum number of system-wide rebuilds permitted at any given time.
     # If set to an empty string, there are no limits.
     maxRebuilds: ""
diff --git a/dependencies/control-plane b/dependencies/control-plane
index 0058585ee..85562edb5 160000
--- a/dependencies/control-plane
+++ b/dependencies/control-plane
@@ -1 +1 @@
-Subproject commit 0058585ee0f6b2bca1cab0a9869cc31ca2184f14
+Subproject commit 85562edb5fe4651ff554bc12310b2bffa6541ca4