diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Economizers/Controller.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Economizers/Controller.mo
index 90e87ed961c..fdb2258b69e 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Economizers/Controller.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Economizers/Controller.mo
@@ -60,7 +60,7 @@ block Controller "Waterside economizer (WSE) enable/disable status"
     final unit="m3/s",
     final quantity="VolumeFlowRate",
     displayUnit="m3/s")=0.015
-      "Desing heat exchanger chilled water volume flow rate"
+      "Design heat exchanger chilled water volume flow rate"
     annotation(Dialog(group="Design parameters"));
 
   parameter Real step(
@@ -92,14 +92,14 @@ block Controller "Waterside economizer (WSE) enable/disable status"
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatRet(
     final unit="K",
     final quantity="ThermodynamicTemperature")
-    "Chiller water return temperature upstream of the WSE"
+    "Chilled water return temperature upstream of the WSE"
     annotation (Placement(transformation(extent={{-220,40},{-180,80}}),
         iconTransformation(extent={{-140,20},{-100,60}})));
 
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatRetDow(
     final unit="K",
     final quantity="ThermodynamicTemperature")
-    "Chiller water return temperature downstream of the WSE"
+    "Chilled water return temperature downstream of the WSE"
     annotation (Placement(transformation(extent={{-220,0},{-180,40}}),
         iconTransformation(extent={{-140,-20},{-100,20}})));
 
@@ -139,7 +139,12 @@ block Controller "Waterside economizer (WSE) enable/disable status"
     "Enable condition based on the outdoor wet bulb temperature"
     annotation (Placement(transformation(extent={{20,40},{40,60}})));
 
-protected
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TChiWatRetDowPre
+    "Predicted downstream WSE chilled water temperature" annotation (Placement(
+        transformation(extent={{180,-118},{200,-98}}), iconTransformation(
+          extent={{100,-100},{120,-80}})));
+
+//protected
   Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Economizers.Subsequences.Tuning wseTun(
     final step=step,
     final wseOnTimDec=wseOnTimDec,
@@ -186,7 +191,17 @@ protected
     "Measures the disable condition satisfied time "
     annotation (Placement(transformation(extent={{20,-20},{40,0}})));
 
-  Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not"
+  Buildings.Controls.OBC.CDL.Logical.FallingEdge falEdg
+    "Falling edge to indicate the moment of disable"
+    annotation (Placement(transformation(extent={{-100,-60},{-80,-40}})));
+
+  Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset truHol(
+    final duration=holdPeriod)
+    "Holds a true signal for a period of time right after disable"
+    annotation (Placement(transformation(extent={{-60,-60},{-40,-40}})));
+
+  Buildings.Controls.OBC.CDL.Logical.Nor nor
+    "Not either of the inputs"
     annotation (Placement(transformation(extent={{-20,-20},{0,0}})));
 
 equation
@@ -221,10 +236,6 @@ equation
     color={0,0,127}));
   connect(add1.y, hys.u)
     annotation (Line(points={{-78,-10},{-62,-10}},color={0,0,127}));
-  connect(hys.y, not1.u)
-    annotation (Line(points={{-38,-10},{-22,-10}}, color={255,0,255}));
-  connect(not1.y, timer.u)
-    annotation (Line(points={{2,-10},{18,-10}}, color={255,0,255}));
   connect(enaTChiWatRet.y, and2.u2) annotation (Line(points={{82,-10},{90,-10},{
           90,42},{98,42}}, color={255,0,255}));
   connect(wseTun.y, wseTOut.uTunPar) annotation (Line(points={{-119,-90},{-110,-90},
@@ -237,6 +248,18 @@ equation
     annotation (Line(points={{2,50},{18,50}}, color={0,0,127}));
   connect(wseTun.y, yTunPar)
     annotation (Line(points={{-119,-90},{190,-90}}, color={0,0,127}));
+  connect(wseTOut.y, TChiWatRetDowPre) annotation (Line(points={{-78,50},{-70,
+          50},{-70,-108},{190,-108}}, color={0,0,127}));
+  connect(nor.y, timer.u)
+    annotation (Line(points={{2,-10},{18,-10}}, color={255,0,255}));
+  connect(hys.y, nor.u1)
+    annotation (Line(points={{-38,-10},{-22,-10}}, color={255,0,255}));
+  connect(truHol.y, nor.u2) annotation (Line(points={{-38,-50},{-30,-50},{-30,
+          -18},{-22,-18}}, color={255,0,255}));
+  connect(falEdg.y, truHol.u)
+    annotation (Line(points={{-78,-50},{-62,-50}}, color={255,0,255}));
+  connect(pre.y, falEdg.u) annotation (Line(points={{162,-50},{170,-50},{170,
+          -70},{-120,-70},{-120,-50},{-102,-50}}, color={255,0,255}));
   annotation (defaultComponentName = "wseSta",
         Icon(graphics={
         Rectangle(
@@ -271,6 +294,13 @@ for <code>delDis</code> time period.
 </li>
 </ul>
 <p>
+The following state machine chart illustrates the transitions between WSE enabled and disabled state:
+</p>
+<p align=\"center\">
+<img alt=\"Image of WSE enable-disable state machine chart\"
+src=\"modelica://Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Economizer/WaterSideEconomizerEnableDisableStateGraph.png\"/>
+</p>
+<p>
 The WSE control sequence uses the following subsequences:
 </p>
 <ul>
@@ -289,6 +319,10 @@ Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Economizers.Subsequence
 revisions="<html>
 <ul>
 <li>
+January 19, 2021, by Milica Grahovac:<br/>
+Added state chart illustration.
+</li>
+<li>
 October 13, 2018, by Milica Grahovac:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Generic/PlantEnable.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Generic/PlantEnable.mo
index 820d8c85de5..3e3518fad4a 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Generic/PlantEnable.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Generic/PlantEnable.mo
@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Generic;
+within Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Generic;
 block PlantEnable "Sequence to enable and disable plant"
 
   parameter Boolean have_WSE = true
@@ -54,7 +54,7 @@ block PlantEnable "Sequence to enable and disable plant"
     "Plant enabling schedule allowing operators to lock out the plant during off-hour"
     annotation (Placement(transformation(extent={{-140,40},{-120,60}})));
 
-protected
+//protected
   final parameter Buildings.Controls.OBC.CDL.Types.Smoothness tabSmo=
     Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments
     "Smoothness of table interpolation";
@@ -231,8 +231,8 @@ annotation (
           textString="STOP")}),
  Documentation(info="<html>
 <p>
-Block that generates chiller plant enable signals and output the initial plant stage,
-according to ASHRAE RP-1711 Advanced Sequences of Operatoin for HVAC Systems Phase II -
+Block that generate chiller plant enable signals and output the initial plant stage,
+according to ASHRAE RP-1711 Advanced Sequences of Operation for HVAC Systems Phase II –
 Central Plants and Hydronic Systems (Draft 4 on January 7, 2019), section 5.2.2 and
 5.2.4.13 Table 2.
 </p>
@@ -279,10 +279,21 @@ The chiller enable schedule is inactive.
 </ul>
 </li>
 </ol>
+<p>
+The following state machine chart illustrates the transitions between plant enable and plant disable:
+</p>
+<p align=\"center\">
+<img alt=\"Image of chiller plant enable-disable state machine chart\"
+src=\"modelica://Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Generic/PlantEnableStateGraph.png\"/>
+</p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+January 19, 2021, by Milica Grahovac:<br/>
+Added state chart illustration.
+</li>
+<li>
 March 12, 2020, by Milica Grahovac:<br/>
 Removed initial stage determination as it is imlemented as a separate sequence. This is for
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1831\">issue 1831</a>.
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/HeadPressure/Controller.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/HeadPressure/Controller.mo
index 9a8224281de..f4d61e08d2f 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/HeadPressure/Controller.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/HeadPressure/Controller.mo
@@ -11,7 +11,7 @@ block Controller "Head pressure controller"
   parameter Boolean have_WSE=true
     "Flag indicating if the plant has waterside economizer"
     annotation (Dialog(group="Plant"));
-  parameter Boolean fixSpePum=false
+  parameter Boolean fixSpePum=true
     "Flag indicating if the plant has fixed speed condenser water pumps"
     annotation (Dialog(group="Plant", enable=not have_WSE));
   parameter Real minChiLif=10
@@ -48,7 +48,7 @@ block Controller "Head pressure controller"
   Buildings.Controls.OBC.CDL.Interfaces.RealInput desConWatPumSpe(
     final min=0,
     final max=1,
-    final unit="1") if (not have_WSE and varSpePum) or have_WSE
+    final unit="1") if not ((not have_WSE) and fixSpePum)
     "Design condenser water pump speed for current stage"
     annotation (Placement(transformation(extent={{-140,0},{-100,40}}),
       iconTransformation(extent={{-140,-40},{-100,0}})));
@@ -72,14 +72,14 @@ block Controller "Head pressure controller"
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yHeaPreConVal(
     final min=0,
     final max=1,
-    final unit="1") if have_WSE or (not have_WSE and not varSpePum)
+    final unit="1") if not ((not have_WSE) and not fixSpePum)
     "Head pressure control valve position"
     annotation (Placement(transformation(extent={{100,0},{140,40}}),
       iconTransformation(extent={{100,-20},{140,20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yConWatPumSpeSet(
     final min=0,
     final max=1,
-    final unit="1") if (not have_WSE and varSpePum) or have_WSE
+    final unit="1") if not ((not have_WSE) and fixSpePum)
     "Condenser water pump speed setpoint"
     annotation (Placement(transformation(extent={{100,-50},{140,-10}}),
       iconTransformation(extent={{100,-80},{140,-40}})));
@@ -94,7 +94,7 @@ block Controller "Head pressure controller"
     annotation (Placement(transformation(extent={{-20,80},{0,100}})));
   Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.HeadPressure.Subsequences.MappingWithoutWSE
     noWSE(
-    final fixSpePum=not varSpePum,
+    final fixSpePum=fixSpePum,
     final minTowSpe=minTowSpe,
     final minConWatPumSpe=minConWatPumSpe,
     final minHeaPreValPos=minHeaPreValPos) if not have_WSE
@@ -109,8 +109,6 @@ block Controller "Head pressure controller"
     annotation (Placement(transformation(extent={{40,-40},{60,-20}})));
 
 protected
-  parameter Boolean varSpePum = not fixSpePum or have_WSE
-    "Flag to indicate if the plant has variable speed condenser water pumps";
   Buildings.Controls.OBC.CDL.Logical.Switch swi if have_HeaPreConSig
     annotation (Placement(transformation(extent={{-20,-110},{0,-90}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con(
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/SetpointController.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/SetpointController.mo
index 4261039a5ba..0a56b6c0e5d 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/SetpointController.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/SetpointController.mo
@@ -237,13 +237,6 @@ block SetpointController
     annotation (Placement(transformation(extent={{-442,-30},{-402,10}}),
         iconTransformation(extent={{-140,-40},{-100,0}})));
 
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput uLif(
-    final unit="K",
-    final quantity="TemperatureDifference") if anyVsdCen
-    "Chiller lift"
-    annotation (Placement(transformation(extent={{-442,30},{-402,70}}),
-        iconTransformation(extent={{-140,0},{-100,40}})));
-
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uLifMax(
     final unit="K",
     final quantity="TemperatureDifference") if anyVsdCen
@@ -262,7 +255,7 @@ block SetpointController
     final unit="K",
     final quantity="ThermodynamicTemperature")
     "Chilled water return temperature"
-    annotation (Placement(transformation(extent={{-442,280},{-402,320}}),
+    annotation (Placement(transformation(extent={{-440,280},{-400,320}}),
         iconTransformation(extent={{-140,-190},{-100,-150}})));
 
   Buildings.Controls.OBC.CDL.Interfaces.RealInput VChiWat_flow(
@@ -288,7 +281,7 @@ block SetpointController
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSup(
     final unit="K",
     final quantity="ThermodynamicTemperature")
-    "Chilled water return temperature"
+    "Chilled water supply temperature"
     annotation (Placement(transformation(extent={{-442,320},{-402,360}}),
     iconTransformation(extent={{-140,30},{-100,70}})));
 
@@ -337,7 +330,14 @@ block SetpointController
     final min=0)
     "Minimum operating part load ratio at current stage"
     annotation (Placement(transformation(extent={{120,320},{160,360}}),
-        iconTransformation(extent={{100,-200},{140,-160}})));
+        iconTransformation(extent={{100,-202},{140,-162}})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yCapReq(
+    final quantity="Power",
+    final unit="W")
+    "Chilled water cooling capacity requirement" annotation (Placement(
+        transformation(extent={{120,370},{160,410}}), iconTransformation(extent=
+           {{100,-230},{140,-190}})));
 
   Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Staging.SetPoints.Subsequences.Up staUp(
     final have_WSE=have_WSE,
@@ -381,7 +381,8 @@ block SetpointController
   CDL.Interfaces.BooleanOutput yDow "Stage down signal" annotation (Placement(
         transformation(extent={{120,22},{156,58}}), iconTransformation(extent={
             {100,130},{140,170}})));
-protected
+
+//protected
   Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Staging.SetPoints.Subsequences.Initial iniSta(
     final have_WSE=have_WSE)
     annotation (Placement(transformation(extent={{-80,100},{-60,120}})));
@@ -423,6 +424,12 @@ protected
     staMat=staMat) "Calculates chiller status setpoint vector"
     annotation (Placement(transformation(extent={{40,-210},{60,-190}})));
 
+  Buildings.Controls.OBC.CDL.Continuous.Add lift(
+    final k1=1,
+    final k2=-1) if anyVsdCen
+    "Calculates chiller lift for variable speed centrifugal chiller containing configurations"
+    annotation (Placement(transformation(extent={{-260,40},{-240,60}})));
+
 equation
   connect(uChiAva, conf.uChiAva)
     annotation (Line(points={{-422,-200},{-382,-200},{-382,-170},{-362,-170}},
@@ -432,9 +439,8 @@ equation
   connect(TChiWatSupSet, capReq.TChiWatSupSet) annotation (Line(points={{-422,
           370},{-370,370},{-370,319},{-322,319}},
                                              color={0,0,127}));
-  connect(TChiWatRet, capReq.TChiWatRet) annotation (Line(points={{-422,300},{
-          -374,300},{-374,314},{-322,314}},
-                                       color={0,0,127}));
+  connect(TChiWatRet, capReq.TChiWatRet) annotation (Line(points={{-420,300},{-374,
+          300},{-374,314},{-322,314}}, color={0,0,127}));
   connect(VChiWat_flow, capReq.VChiWat_flow) annotation (Line(points={{-422,270},
           {-370,270},{-370,309},{-322,309}}, color={0,0,127}));
   connect(conf.yDesCap, cap.uDesCap) annotation (Line(points={{-338,-162},{-322,
@@ -465,8 +471,6 @@ equation
   connect(cap.yUpMin, PLRs.uUpCapMin) annotation (Line(points={{-248,-178},{
           -242,-178},{-242,-187},{-184,-187}},
                                        color={0,0,127}));
-  connect(uLif, PLRs.uLif) annotation (Line(points={{-422,50},{-202,50},{-202,-190},
-          {-184,-190}},     color={0,0,127}));
   connect(uLifMax, PLRs.uLifMax) annotation (Line(points={{-422,20},{-212,20},{-212,
           -192},{-184,-192}},    color={0,0,127}));
   connect(uLifMin, PLRs.uLifMin) annotation (Line(points={{-422,-10},{-222,-10},
@@ -542,7 +546,7 @@ equation
   connect(sta.yAvaUp, cha.uAvaUp) annotation (Line(points={{-298,-203},{-292,-203},
           {-292,-148},{-40,-148},{-40,-164},{-22,-164}}, color={255,127,0}));
   connect(sta.yAvaDow, cha.uAvaDow) annotation (Line(points={{-298,-206},{-290,-206},
-          {-290,-150},{-42,-150},{-42,-168},{-22,-168}}, color={255,127,0}));
+          {-290,-150},{-44,-150},{-44,-168},{-22,-168}}, color={255,127,0}));
   connect(staUp.y, cha.uUp) annotation (Line(points={{-78,-110},{-50,-110},{-50,
           -172},{-22,-172}}, color={255,0,255}));
   connect(staDow.y, cha.uDow) annotation (Line(points={{-78,-230},{-50,-230},{-50,
@@ -562,7 +566,7 @@ equation
           {-100,370},{-100,113},{-82,113}}, color={0,0,127}));
   connect(uTunPar, iniSta.uTunPar) annotation (Line(points={{-420,150},{-104,150},
           {-104,116},{-82,116}}, color={0,0,127}));
-  connect(iniSta.yIni, cha.uIni) annotation (Line(points={{-59,110},{-28,110},{-28,
+  connect(iniSta.yIni, cha.uIni) annotation (Line(points={{-59,110},{-30,110},{-30,
           -160},{-22,-160}}, color={255,127,0}));
   connect(TOutWet, iniSta.TOutWet) annotation (Line(points={{-420,400},{-96,400},
           {-96,119},{-82,119}}, color={0,0,127}));
@@ -581,6 +585,14 @@ equation
           {140,80}}, color={255,0,255}));
   connect(staDow.y, yDow) annotation (Line(points={{-78,-230},{-60,-230},{-60,
           40},{138,40}}, color={255,0,255}));
+  connect(TChiWatRet, lift.u1) annotation (Line(points={{-420,300},{-388,300},{-388,
+          56},{-262,56}}, color={0,0,127}));
+  connect(TChiWatSupSet, lift.u2) annotation (Line(points={{-422,370},{-360,370},
+          {-360,44},{-262,44}}, color={0,0,127}));
+  connect(PLRs.uLif, lift.y) annotation (Line(points={{-184,-190},{-202,-190},{-202,
+          50},{-238,50}}, color={0,0,127}));
+  connect(capReq.y, yCapReq) annotation (Line(points={{-298,310},{-80,310},{-80,
+          390},{140,390}}, color={0,0,127}));
   annotation (defaultComponentName = "staSetCon",
         Icon(coordinateSystem(extent={{-100,-220},{100,200}}, initialScale=0.2),
         graphics={
@@ -643,11 +655,6 @@ equation
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="uLifMax"),
-        Text(
-          extent={{-100,32},{-68,14}},
-          lineColor={0,0,127},
-          pattern=LinePattern.Dash,
-          textString="uLif"),
         Text(
           extent={{-96,100},{-64,84}},
           lineColor={244,125,35},
@@ -722,7 +729,12 @@ equation
           extent={{48,168},{96,132}},
           lineColor={217,67,180},
           pattern=LinePattern.Dash,
-          textString="yChaDow")}),
+          textString="yChaDow"),
+        Text(
+          extent={{42,-198},{94,-220}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="yCapReq")}),
                                  Diagram(
         coordinateSystem(preserveAspectRatio=false,
         extent={{-400,-300},{120,420}})),
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Change.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Change.mo
index 012bc9eae21..05f1d707463 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Change.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Change.mo
@@ -12,12 +12,12 @@ block Change "Calculates the chiller stage signal"
 
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uPla
     "Plant enable signal"
-    annotation (Placement(transformation(extent={{-478,140},{-438,180}}),
+    annotation (Placement(transformation(extent={{-480,140},{-440,180}}),
     iconTransformation(extent={{-140,-120},{-100,-80}})));
 
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uUp
     "Stage up status"
-    annotation (Placement(transformation(extent={{-478,-60},{-438,-20}}),
+    annotation (Placement(transformation(extent={{-480,-60},{-440,-20}}),
       iconTransformation(extent={{-140,-40},{-100,0}})));
 
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uDow
@@ -29,21 +29,21 @@ block Change "Calculates the chiller stage signal"
     final min=0,
     final max=nSta)
     "Initial chiller stage (at plant enable)"
-     annotation (Placement(transformation(extent={{-478,200},{-438,240}}),
+     annotation (Placement(transformation(extent={{-480,200},{-440,240}}),
      iconTransformation(extent={{-140,80},{-100,120}})));
 
   Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uAvaUp(
     final min=0,
     final max=nSta)
     "Next available stage up"
-    annotation (Placement(transformation(extent={{-478,80},{-438,120}}),
+    annotation (Placement(transformation(extent={{-480,80},{-440,120}}),
       iconTransformation(extent={{-140,40},{-100,80}})));
 
   Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uAvaDow(
     final min=0,
     final max=nSta)
     "Next available stage down"
-    annotation (Placement(transformation(extent={{-478,0}, {-438,40}}),
+    annotation (Placement(transformation(extent={{-480,0},{-440,40}}),
     iconTransformation(extent={{-140,0},{-100,40}})));
 
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yChaEdg
@@ -70,9 +70,9 @@ block Change "Calculates the chiller stage signal"
         transformation(extent={{440,140},{480,180}}),  iconTransformation(
           extent={{100,20},{140,60}})));
 
-protected
+//protected
   Buildings.Controls.OBC.CDL.Logical.Or or2 "Logical or"
-    annotation (Placement(transformation(extent={{-380,-100},{-360,-80}})));
+    annotation (Placement(transformation(extent={{-360,-100},{-340,-80}})));
 
   Buildings.Controls.OBC.CDL.Logical.Edge edg1
      "Boolean signal change"
@@ -93,9 +93,6 @@ protected
   Buildings.Controls.OBC.CDL.Conversions.IntegerToReal intToRea1 "Type converter"
     annotation (Placement(transformation(extent={{-320,90},{-300,110}})));
 
-  Buildings.Controls.OBC.CDL.Logical.Latch lat "Latch"
-    annotation (Placement(transformation(extent={{-320,50},{-300,70}})));
-
   Buildings.Controls.OBC.CDL.Conversions.IntegerToReal intToRea2
     "Integer to real conversion"
     annotation (Placement(transformation(extent={{-40,210},{-20,230}})));
@@ -184,17 +181,22 @@ protected
     final trueHoldDuration=delayStaCha,
     final falseHoldDuration=0)
     "Stage change hold"
-    annotation (Placement(transformation(extent={{340,-118},{360,-98}})));
+    annotation (Placement(transformation(extent={{340,-120},{360,-100}})));
 
   Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not"
-    annotation (Placement(transformation(extent={{378,-118},{398,-98}})));
+    annotation (Placement(transformation(extent={{372,-120},{392,-100}})));
 
   Buildings.Controls.OBC.CDL.Logical.Pre pre1 "Previous value"
-    annotation (Placement(transformation(extent={{406,-118},{426,-98}})));
+    annotation (Placement(transformation(extent={{400,-120},{420,-100}})));
 
   Buildings.Controls.OBC.CDL.Integers.Change cha "Integer change"
     annotation (Placement(transformation(extent={{380,0},{400,20}})));
 
+  CDL.Logical.And                        and4
+    "Consider staging up only if stage down signal is not on"
+    annotation (Placement(transformation(extent={{-320,50},{-300,70}})));
+  CDL.Logical.Not                        not2 "Logical not"
+    annotation (Placement(transformation(extent={{-360,30},{-340,50}})));
 equation
   connect(reaToInt.y,ySta)
     annotation (Line(points={{422,160},{460,160}}, color={255,127,0}));
@@ -209,7 +211,7 @@ equation
                                                   color={255,0,255}));
   connect(triSam.y,switch2. u3) annotation (Line(points={{162,60},{170,60},{170,
           192},{338,192}},     color={0,0,127}));
-  connect(uIni,intToRea2. u) annotation (Line(points={{-458,220},{-42,220}},
+  connect(uIni,intToRea2. u) annotation (Line(points={{-460,220},{-42,220}},
                          color={255,127,0}));
   connect(intToRea2.y,switch2. u1) annotation (Line(points={{-18,220},{140,220},
           {140,208},{338,208}},
@@ -247,23 +249,20 @@ equation
                                color={255,0,255}));
   connect(staChaHol1.y,edg2. u)
     annotation (Line(points={{2,-170},{18,-170}},    color={255,0,255}));
-  connect(uUp, lat.u) annotation (Line(points={{-458,-40},{-380,-40},{-380,60},{
-          -322,60}}, color={255,0,255}));
-  connect(uDow, lat.clr) annotation (Line(points={{-460,-140},{-340,-140},{-340,
-          54},{-322,54}}, color={255,0,255}));
-  connect(uUp, or2.u1) annotation (Line(points={{-458,-40},{-400,-40},{-400,-90},
-          {-382,-90}}, color={255,0,255}));
-  connect(uDow, or2.u2) annotation (Line(points={{-460,-140},{-400,-140},{-400,-98},
-          {-382,-98}}, color={255,0,255}));
+  connect(uUp, or2.u1) annotation (Line(points={{-460,-40},{-380,-40},{-380,-90},
+          {-362,-90}}, color={255,0,255}));
+  connect(uDow, or2.u2) annotation (Line(points={{-460,-140},{-380,-140},{-380,
+          -98},{-362,-98}},
+                       color={255,0,255}));
   connect(uAvaUp, intToRea1.u)
-    annotation (Line(points={{-458,100},{-322,100}}, color={255,127,0}));
+    annotation (Line(points={{-460,100},{-322,100}}, color={255,127,0}));
   connect(uAvaDow, intToRea.u)
-    annotation (Line(points={{-458,20},{-322,20}}, color={255,127,0}));
+    annotation (Line(points={{-460,20},{-322,20}}, color={255,127,0}));
   connect(holIniSta.y, not3.u) annotation (Line(points={{-298,160},{-230,160},{-230,
           -60},{-222,-60}},      color={255,0,255}));
   connect(not3.y, and6.u1) annotation (Line(points={{-198,-60},{-180,-60},{-180,
           -72},{-162,-72}},                       color={255,0,255}));
-  connect(or2.y, and6.u2) annotation (Line(points={{-358,-90},{-180,-90},{-180,
+  connect(or2.y, and6.u2) annotation (Line(points={{-338,-90},{-180,-90},{-180,
           -80},{-162,-80}}, color={255,0,255}));
   connect(and6.y, and1.u1) annotation (Line(points={{-138,-80},{-100,-80},{-100,
           -190},{-82,-190}},  color={255,0,255}));
@@ -271,18 +270,16 @@ equation
           {60,-140},{60,-178},{78,-178}},    color={255,0,255}));
   connect(and6.y, edg1.u)
     annotation (Line(points={{-138,-80},{-2,-80}}, color={255,0,255}));
-  connect(uPla, booToRea.u) annotation (Line(points={{-458,160},{-400,160},{
-          -400,120},{40,120},{40,10},{198,10}}, color={255,0,255}));
+  connect(uPla, booToRea.u) annotation (Line(points={{-460,160},{-400,160},{-400,
+          120},{40,120},{40,10},{198,10}},      color={255,0,255}));
   connect(or3.y, triSam1.trigger) annotation (Line(points={{242,-50},{250,-50},
           {250,-1.8}}, color={255,0,255}));
-  connect(uPla, falEdg.u) annotation (Line(points={{-458,160},{-420,160},{-420,
-          -20},{0,-20},{0,-30},{38,-30}}, color={255,0,255}));
+  connect(uPla, falEdg.u) annotation (Line(points={{-460,160},{-420,160},{-420,-20},
+          {0,-20},{0,-30},{38,-30}},      color={255,0,255}));
   connect(falEdg.y, or3.u1) annotation (Line(points={{62,-30},{210,-30},{210,
           -50},{218,-50}}, color={255,0,255}));
   connect(uPla, edg.u)
-    annotation (Line(points={{-458,160},{-382,160}}, color={255,0,255}));
-  connect(lat.y, switch1.u2)
-    annotation (Line(points={{-298,60},{-202,60}}, color={255,0,255}));
+    annotation (Line(points={{-460,160},{-382,160}}, color={255,0,255}));
   connect(and3.u1, and6.y) annotation (Line(points={{278,100},{-100,100},{-100,-80},
           {-138,-80}}, color={255,0,255}));
   connect(lat1.y, switch2.u2) annotation (Line(points={{124,160},{160,160},{160,
@@ -296,21 +293,32 @@ equation
   connect(edg1.y, or3.u2) annotation (Line(points={{22,-80},{210,-80},{210,-58},
           {218,-58}}, color={255,0,255}));
   connect(staChaHol3.y, not1.u)
-    annotation (Line(points={{362,-108},{376,-108}}, color={255,0,255}));
+    annotation (Line(points={{362,-110},{370,-110}}, color={255,0,255}));
   connect(not1.y, pre1.u)
-    annotation (Line(points={{400,-108},{404,-108}}, color={255,0,255}));
-  connect(pre1.y, and6.u3) annotation (Line(points={{428,-108},{428,-286},{-170,
-          -286},{-170,-88},{-162,-88}}, color={255,0,255}));
+    annotation (Line(points={{394,-110},{398,-110}}, color={255,0,255}));
+  connect(pre1.y, and6.u3) annotation (Line(points={{422,-110},{428,-110},{428,-280},
+          {-170,-280},{-170,-88},{-162,-88}},
+                                        color={255,0,255}));
   connect(reaToInt.y, cha.u) annotation (Line(points={{422,160},{430,160},{430,126},
           {360,126},{360,10},{378,10}}, color={255,127,0}));
   connect(cha.y, yChaEdg) annotation (Line(points={{402,10},{432,10},{432,0},{460,
           0}}, color={255,0,255}));
   connect(cha.y, staChaHol3.u) annotation (Line(points={{402,10},{410,10},{410,-60},
-          {320,-60},{320,-108},{338,-108}}, color={255,0,255}));
+          {320,-60},{320,-110},{338,-110}}, color={255,0,255}));
   connect(cha.up, yChaUpEdg) annotation (Line(points={{402,16},{420,16},{420,60},
           {460,60}}, color={255,0,255}));
   connect(cha.down, yChaDowEdg) annotation (Line(points={{402,4},{420,4},{420,-60},
           {460,-60}}, color={255,0,255}));
+  connect(uUp, and4.u1) annotation (Line(points={{-460,-40},{-390,-40},{-390,60},
+          {-322,60}}, color={255,0,255}));
+  connect(uDow, not2.u) annotation (Line(points={{-460,-140},{-390,-140},{-390,
+          40},{-362,40}},
+                        color={255,0,255}));
+  connect(not2.y, and4.u2) annotation (Line(points={{-338,40},{-330,40},{-330,
+          52},{-322,52}},
+                      color={255,0,255}));
+  connect(and4.y, switch1.u2) annotation (Line(points={{-298,60},{-202,60}},
+                     color={255,0,255}));
   annotation (defaultComponentName = "cha",
         Icon(graphics={
         Rectangle(
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Down.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Down.mo
index a655525666a..7fad58cb2d8 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Down.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Down.mo
@@ -77,7 +77,7 @@ block Down "Generates a stage down signal"
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSup(
     final unit="K",
     final quantity="ThermodynamicTemperature")
-    "Chilled water return temperature"
+    "Chilled water supply temperature"
     annotation (Placement(transformation(extent={{-220,10},{-180,50}}),
     iconTransformation(extent={{-140,-40},{-100,0}})));
 
@@ -111,7 +111,7 @@ block Down "Generates a stage down signal"
     annotation (Placement(transformation(extent={{180,-10},{200,10}}),
         iconTransformation(extent={{100,-20},{140,20}})));
 
-protected
+//protected
   Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Staging.SetPoints.Subsequences.FailsafeCondition faiSafCon(
     final have_serChi=have_serChi,
     final faiSafTruDelay=faiSafTruDelay,
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/FailsafeCondition.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/FailsafeCondition.mo
index bab48fc7170..d8c20b69781 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/FailsafeCondition.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/FailsafeCondition.mo
@@ -60,7 +60,7 @@ block FailsafeCondition
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSup(
     final unit="K",
     final quantity="ThermodynamicTemperature")
-    "Chilled water return temperature"
+    "Chilled water supply temperature"
     annotation (Placement(transformation(extent={{-180,0},{-140,40}}),
         iconTransformation(extent={{-140,0},{-100,40}})));
 
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Initial.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Initial.mo
index bf5f1a7a447..d3d422e8f1e 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Initial.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Initial.mo
@@ -194,10 +194,21 @@ annotation (defaultComponentName = "iniSta",
 <li>If predicted waterside economizer outlet temperature calculated using <a href=\"modelica://Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Economizers.Subsequences.PredictedOutletTemperature\">Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Economizers.Subsequences.PredictedOutletTemperature</a> with predicted heat exchanger part load ratio <span style=\"font-family: monospace;\">PLRHeaExc</span> set to 1 is at least <span style=\"font-family: monospace;\">wseDt</span> below the chilled water supply temperature setpoint <span style=\"font-family: monospace;\">TChiWatSupSet</span>, then the initial stage will be 0, meaning that the plant initiates in a waterside economizer only mode. </li>
 <li>Otherwise, the initial stage will be the lowest available stage <span style=\"font-family: monospace;\">uUp</span>. </li>
 </ul>
+<p>
+The following state machine chart illustrates the initial stage selection for plants with a waterside economizer:
+</p>
+<p align=\"center\">
+<img alt=\"Image of initial stage selection state machine chart\"
+src=\"modelica://Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/InitialStageSelectionStateGraph.png\"/>
+</p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+January 19, 2021, by Milica Grahovac:<br/>
+Added state chart illustration.
+</li>
+<li>
 March 12, 2020, by Milica Grahovac:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/PartLoadRatios.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/PartLoadRatios.mo
index 05529a99d39..b173a511051 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/PartLoadRatios.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/PartLoadRatios.mo
@@ -41,6 +41,12 @@ block PartLoadRatios
     "Maximum stage up or down part load ratio for variable speed centrifugal stage types"
     annotation(Evaluate=true, Dialog(enable=anyVsdCen));
 
+  parameter Real avePer(
+    final unit="s",
+    final quantity="Time")=300
+    "Moving mean time period for staging multiplier calculation for variable speed centrifugal stage types"
+    annotation(Evaluate=true, Dialog(enable=anyVsdCen));
+
   Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u(
     final min=0,
     final max=nSta) "Chiller stage"
@@ -301,7 +307,7 @@ protected
   Buildings.Controls.OBC.CDL.Continuous.Product mult3 if anyVsdCen "Multiplier"
     annotation (Placement(transformation(extent={{100,-510},{120,-490}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.Add add3 if anyVsdCen "Subtract"
+  Buildings.Controls.OBC.CDL.Continuous.Add add3 if anyVsdCen "Add"
     annotation (Placement(transformation(extent={{160,-482},{180,-462}})));
 
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant const3(
@@ -411,6 +417,10 @@ protected
     "Maximum output to avoid zero denominator in downstream"
     annotation (Placement(transformation(extent={{-300,-170},{-280,-150}})));
 
+  Buildings.Controls.OBC.CDL.Continuous.MovingMean movMea(
+    final delta=avePer) if anyVsdCen
+    annotation (Placement(transformation(extent={{300,-330},{320,-310}})));
+
 equation
   connect(extCurTyp.y, curStaTyp.u)
     annotation (Line(points={{-98,300},{-82,300}},   color={0,0,127}));
@@ -555,10 +565,6 @@ equation
           {258,-376}}, color={0,0,127}));
   connect(maxLim.y, min.u1) annotation (Line(points={{182,-350},{220,-350},{220,
           -364},{258,-364}}, color={0,0,127}));
-  connect(min.y, swi3.u3) annotation (Line(points={{282,-370},{300,-370},{300,-300},
-          {50,-300},{50,-238},{58,-238}}, color={0,0,127}));
-  connect(min.y, swi1.u3) annotation (Line(points={{282,-370},{300,-370},{300,-70},
-          {150,-70},{150,62},{158,62}}, color={0,0,127}));
   connect(swi4.y, greThr1.u) annotation (Line(points={{182,-160},{192,-160},{192,
           -100},{198,-100}},     color={0,0,127}));
   connect(swi.y, swi5.u1) annotation (Line(points={{222,150},{240,150},{240,238},
@@ -609,6 +615,13 @@ equation
           {-228,-74},{-202,-74}}, color={0,0,127}));
   connect(uCapReq, opePlrUp.u1) annotation (Line(points={{-400,-10},{-228,-10},
           {-228,-134},{-202,-134}}, color={0,0,127}));
+  connect(min.y, movMea.u) annotation (Line(points={{282,-370},{290,-370},{290,-320},
+          {298,-320}}, color={0,0,127}));
+  connect(movMea.y, swi3.u3) annotation (Line(points={{322,-320},{340,-320},{340,
+          -300},{50,-300},{50,-238},{58,-238}}, color={0,0,127}));
+  connect(movMea.y, swi1.u3) annotation (Line(points={{322,-320},{340,-320},{340,
+          -260},{150,-260},{150,62},{158,62}},
+                         color={0,0,127}));
   annotation (defaultComponentName = "PLRs",
         Icon(graphics={
         Text(
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Up.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Up.mo
index 3d6f923581b..ee2771eb335 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Up.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Up.mo
@@ -123,7 +123,7 @@ block Up "Generates a stage up signal"
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSup(
     final unit="K",
     final quantity="ThermodynamicTemperature")
-    "Chilled water return temperature"
+    "Chilled water supply temperature"
     annotation (Placement(transformation(extent={{-200,-150},{-160,-110}}),
     iconTransformation(extent={{-140,10},{-100,50}})));
 
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Validation/CapacityRequirement.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Validation/CapacityRequirement.mo
index 454900d63d6..5f37688752f 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Validation/CapacityRequirement.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Validation/CapacityRequirement.mo
@@ -39,7 +39,7 @@ protected
   Buildings.Controls.OBC.CDL.Continuous.Sources.Sine TChiWatRet(
     final amplitude=2,
     final freqHz=1/300,
-    final offset=aveTChiWatRet) "Chiller water return temeprature"
+    final offset=aveTChiWatRet) "Chilled water return temeprature"
     annotation (Placement(transformation(extent={{-140,-30},{-120,-10}})));
 
   Buildings.Controls.OBC.CDL.Continuous.Sources.Sine chiWatFlow(
@@ -59,7 +59,7 @@ protected
   Buildings.Controls.OBC.CDL.Continuous.Sources.Sine TChiWatRet1(
     final amplitude=2,
     final freqHz=1/300,
-    final offset=aveTChiWatRet) "Chiller water return temeprature"
+    final offset=aveTChiWatRet) "Chilled water return temeprature"
     annotation (Placement(transformation(extent={{-40,-30},{-20,-10}})));
 
   Buildings.Controls.OBC.CDL.Continuous.Sources.Sine chiWatFlow1(
@@ -81,7 +81,7 @@ protected
   Buildings.Controls.OBC.CDL.Continuous.Sources.Sine TChiWatRet2(
     final amplitude=2,
     final freqHz=1/300,
-    final offset=aveTChiWatRet) "Chiller water return temeprature"
+    final offset=aveTChiWatRet) "Chilled water return temeprature"
     annotation (Placement(transformation(extent={{60,-30},{80,-10}})));
 
   Buildings.Controls.OBC.CDL.Continuous.Sources.Sine chiWatFlow2(
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Validation/SetpointController_WSE.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Validation/SetpointController_WSE.mo
index 79aec42760e..be45718386b 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Validation/SetpointController_WSE.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Validation/SetpointController_WSE.mo
@@ -53,7 +53,7 @@ protected
     final amplitude=7,
     final offset=273.15 + 15,
     final freqHz=1/21600)
-    "Chiller water return temeprature"
+    "Chilled water return temeprature"
     annotation (Placement(transformation(extent={{-200,140},{-180,160}})));
 
   Buildings.Controls.OBC.CDL.Continuous.Sources.Sine chiWatFlow(
@@ -127,7 +127,7 @@ protected
     final amplitude=7,
     final offset=273.15 + 15,
     final freqHz=1/21600)
-    "Chiller water return temeprature"
+    "Chilled water return temeprature"
     annotation (Placement(transformation(extent={{-200,-100},{-180,-80}})));
 
   Buildings.Controls.OBC.CDL.Continuous.Sources.Sine chiWatFlow1(
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Validation/SetpointController_noWSE.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Validation/SetpointController_noWSE.mo
index d2eb9b94f34..54ad3d21e6e 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Validation/SetpointController_noWSE.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Validation/SetpointController_noWSE.mo
@@ -62,7 +62,7 @@ protected
     final amplitude=7,
     final offset=273.15 + 15,
     final freqHz=1/21600)
-    "Chiller water return temeprature"
+    "Chilled water return temeprature"
     annotation (Placement(transformation(extent={{-200,140},{-180,160}})));
 
   Buildings.Controls.OBC.CDL.Continuous.Sources.Sine chiWatFlow(
@@ -106,7 +106,7 @@ protected
     final amplitude=7,
     final offset=273.15 + 15,
     final freqHz=1/21600)
-    "Chiller water return temeprature"
+    "Chilled water return temeprature"
     annotation (Placement(transformation(extent={{-200,-100},{-180,-80}})));
 
   Buildings.Controls.OBC.CDL.Continuous.Sources.Sine chiWatFlow1(
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/Controller.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/Controller.mo
index c7bca0a5bfc..547580b3ebf 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/Controller.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/Controller.mo
@@ -314,7 +314,7 @@ block Controller "Cooling tower controller"
     annotation (Placement(transformation(extent={{100,-260},{140,-220}}),
       iconTransformation(extent={{100,-190},{140,-150}})));
 
-protected
+//protected
   Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Towers.FanSpeed.Controller towFanSpe(
     final nChi=nChi,
     final nTowCel=nTowCel,
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/Controller.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/Controller.mo
index 944281ec532..bdc5bf7ed1c 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/Controller.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/Controller.mo
@@ -232,6 +232,7 @@ block Controller "Tower fan speed control"
     final fanSpeMin=fanSpeMin,
     final LIFT_min=LIFT_min,
     final TConWatRet_nominal=TConWatRet_nominal,
+    final TConWatSup_nominal=TConWatSup_nominal,
     final TChiWatSupMin=TChiWatSupMin,
     final cheMinFanSpe=cheMinFanSpe,
     final cheMaxTowSpe=cheMaxTowSpe,
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/EnabledWSE/Controller.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/EnabledWSE/Controller.mo
index 61c0699b552..13770d19c77 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/EnabledWSE/Controller.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/EnabledWSE/Controller.mo
@@ -83,7 +83,7 @@ block Controller "Tower fan speed control when waterside economizer is enabled"
     annotation (Placement(transformation(extent={{100,-20},{140,20}}),
       iconTransformation(extent={{100,-20},{140,20}})));
 
-protected
+//protected
   Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Towers.FanSpeed.EnabledWSE.Subsequences.IntegratedOperation
     intOpe(
     final nChi=nChi,
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/EnabledWSE/Subsequences/IntegratedOperation.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/EnabledWSE/Subsequences/IntegratedOperation.mo
index 7817c5bac72..15ba499b159 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/EnabledWSE/Subsequences/IntegratedOperation.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/EnabledWSE/Subsequences/IntegratedOperation.mo
@@ -54,7 +54,7 @@ block IntegratedOperation
     annotation (Placement(transformation(extent={{160,-100},{200,-60}}),
       iconTransformation(extent={{100,-20},{140,20}})));
 
-protected
+//protected
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant chiMinCycLoa[nChi](
     final k=chiMinCap)
     "Minimum cycling load of each chiller"
@@ -71,6 +71,7 @@ protected
     final Td=Td,
     final yMax=yMax,
     final yMin=yMin,
+    reverseActing=false,
     final y_reset=yMax)
     "Controller to maintain chiller load at the sum of minimum cycling load of operating chillers"
     annotation (Placement(transformation(extent={{80,90},{100,110}})));
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/EnabledWSE/Subsequences/WSEOperation.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/EnabledWSE/Subsequences/WSEOperation.mo
index c0884ffc8e8..85d8825624d 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/EnabledWSE/Subsequences/WSEOperation.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/EnabledWSE/Subsequences/WSEOperation.mo
@@ -60,7 +60,7 @@ block WSEOperation
     annotation (Placement(transformation(extent={{140,40},{180,80}}),
       iconTransformation(extent={{100,-20},{140,20}})));
 
-protected
+//protected
   Buildings.Controls.OBC.CDL.Logical.And and2 "Logical and"
     annotation (Placement(transformation(extent={{40,130},{60,150}})));
   Buildings.Controls.OBC.CDL.Logical.Timer tim(
@@ -109,6 +109,7 @@ protected
     final Td=Td,
     final yMax=yMax,
     final yMin=yMin,
+    reverseActing=false,
     final y_reset=0)
     "Controller to maintain chilled water supply temperature at setpoint"
     annotation (Placement(transformation(extent={{-60,-130},{-40,-110}})));
@@ -172,11 +173,6 @@ equation
     annotation (Line(points={{62,60},{98,60}}, color={255,0,255}));
   connect(dTChiSup.y, hys3.u)
     annotation (Line(points={{-88,-40},{-42,-40}}, color={0,0,127}));
-  connect(TChiWatSupSet, chiWatTemCon.u_s)
-    annotation (Line(points={{-160,-120},{-62,-120}}, color={0,0,127}));
-  connect(TChiWatSup, chiWatTemCon.u_m)
-    annotation (Line(points={{-160,-40},{-120,-40},{-120,-150},{-50,-150},{-50,-132}},
-      color={0,0,127}));
   connect(lat.y, chiWatTemCon.trigger)
     annotation (Line(points={{62,60},{74,60},{74,-80},{-70,-80},{-70,-140},
       {-56,-140},{-56,-132}},  color={255,0,255}));
@@ -225,6 +221,10 @@ equation
     annotation (Line(points={{102,132},{120,132},{120,80},{-50,80},{-50,60},
       {-42,60}}, color={255,0,255}));
 
+  connect(TChiWatSupSet, chiWatTemCon.u_s)
+    annotation (Line(points={{-160,-120},{-62,-120}}, color={0,0,127}));
+  connect(TChiWatSup, chiWatTemCon.u_m) annotation (Line(points={{-160,-40},{
+          -110,-40},{-110,-152},{-50,-152},{-50,-132}}, color={0,0,127}));
 annotation (
   defaultComponentName="wseTowSpeWSEOpe",
   Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/ReturnWaterTemperature/Controller.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/ReturnWaterTemperature/Controller.mo
index e647fefebc6..58cb363d09b 100644
--- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/ReturnWaterTemperature/Controller.mo
+++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/ReturnWaterTemperature/Controller.mo
@@ -232,7 +232,7 @@ block Controller
     "Tower fan speed control when the plant is not closed coupled"
     annotation (Placement(transformation(extent={{40,-220},{60,-200}})));
 
-protected
+//protected
   Buildings.Controls.OBC.CDL.Logical.MultiOr mulOr(
     final nu=nChi) "Check if any chiller is enabled"
     annotation (Placement(transformation(extent={{-120,200},{-100,220}})));
diff --git a/Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Economizer/WaterSideEconomizerEnableDisableStateGraph.png b/Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Economizer/WaterSideEconomizerEnableDisableStateGraph.png
new file mode 100644
index 00000000000..52dcff72dd0
Binary files /dev/null and b/Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Economizer/WaterSideEconomizerEnableDisableStateGraph.png differ
diff --git a/Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Economizer/WaterSideEconomizerEnableDisableStateGraph.svg b/Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Economizer/WaterSideEconomizerEnableDisableStateGraph.svg
new file mode 100644
index 00000000000..e67f501c807
--- /dev/null
+++ b/Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Economizer/WaterSideEconomizerEnableDisableStateGraph.svg
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="177.77692mm"
+   height="53.24939mm"
+   viewBox="0 0 177.77692 53.24939"
+   version="1.1"
+   id="svg2261">
+  <defs
+     id="defs2255">
+    <marker
+       style="overflow:visible"
+       orient="auto"
+       overflow="visible"
+       id="marker5381-6-6-0">
+      <path
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         id="path4488-0-7"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       orient="auto"
+       overflow="visible"
+       id="marker5553-0-3-6">
+      <path
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         id="path4485-1-0"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata2258">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="translate(-19.089154,-22.818619)">
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.0605999;stroke-opacity:0.666667"
+       id="path4497-0-51"
+       d="M 98.387026,75.880981 C 90.011225,75.264772 83.190754,73.486862 79.634915,70.99283 c -1.68806,-1.183978 -2.193229,-1.964938 -2.193229,-3.390698 0,-1.411283 0.491818,-2.186213 2.12819,-3.353293 3.382629,-2.41232 9.554979,-4.089818 17.772559,-4.83022 3.626055,-0.326678 9.451835,-0.349218 13.048155,-0.0505 7.10585,0.59028 12.65529,1.845119 16.44925,3.719629 4.93012,2.435532 5.58369,5.412581 1.76623,8.04545 -3.35077,2.311299 -10.09837,4.065521 -18.0566,4.694409 -3.25256,0.256982 -9.04808,0.282321 -12.163245,0.0529 z" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.1783;marker-end:url(#marker5381-6-6-0)"
+       id="path4499-2-97"
+       d="M 105.0106,39.73002 V 58.971651" />
+    <path
+       d="M 94.76547,59.57706 C 80.313958,50.19884 97.14105,39.85225 97.14105,39.85225"
+       id="path4503-4-13"
+       style="fill:none;stroke:#000000;stroke-width:0.214825px;marker-end:url(#marker5553-0-3-6)" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.23333px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="103.69078"
+       y="29.803211"
+       id="text4487-8-5-3-120"><tspan
+         x="103.69078"
+         y="29.803211"
+         style="font-size:4.23333px;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583"
+         id="tspan8823-6">Enable WSE</tspan><tspan
+         x="103.69078"
+         y="35.094872"
+         style="font-size:4.23333px;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583"
+         id="tspan11946">hold for holdPeriod</tspan></text>
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.0623623;stroke-opacity:0.666667"
+       id="path4497-0-4-6"
+       d="m 97.408534,39.57466 c -8.869069,-0.61628 -16.091199,-2.39438 -19.85644,-4.88869 -1.787469,-1.18411 -2.322391,-1.96516 -2.322391,-3.39108 0,-1.41144 0.520782,-2.18645 2.25352,-3.35367 3.581831,-2.41259 10.117672,-4.09027 18.819201,-4.83075 3.839596,-0.32673 10.008466,-0.34926 13.816576,-0.0505 7.52431,0.59034 13.40057,1.84532 17.41795,3.72004 5.22047,2.4358 5.91253,5.41318 1.87025,8.04636 -3.54809,2.31155 -10.69306,4.06597 -19.11997,4.69491 -3.4441,0.25703 -9.58092,0.28236 -12.879546,0.0529 z" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.23333px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="103.55734"
+       y="65.867455"
+       id="text4487-8-5-3-0-0"><tspan
+         x="103.55734"
+         y="65.867455"
+         style="font-size:4.23333px;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583"
+         id="tspan8823-7-6">Disable WSE</tspan><tspan
+         x="103.55734"
+         y="71.159119"
+         style="font-size:4.23333px;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583"
+         id="tspan11950">hold for holdPeriod</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.23333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="19.101557"
+       y="47.238701"
+       id="text4487-4-1-0-3-4-1-4-9-0"><tspan
+         x="19.101557"
+         y="47.238701"
+         style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+         id="tspan6888-9-3-8-2">TChiWatRet (upstream WSE) &gt; </tspan><tspan
+         x="19.101557"
+         y="53.165363"
+         style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+         id="tspan1517">wseTOut.y + TOffsetEna </tspan><tspan
+         x="19.101557"
+         y="58.774525"
+         style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+         id="tspan6940-0-1-39" /></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.23333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="110.77113"
+       y="44.804279"
+       id="text4487-4-1-0-3-4-1-4-9-0-4"><tspan
+         x="110.77113"
+         y="44.804279"
+         style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+         id="tspan6888-9-3-8-2-4">TChiWatRetDow (downstream WSE) &gt; </tspan><tspan
+         x="110.77113"
+         y="50.730942"
+         style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+         id="tspan1515">TChiWatRet (upstream WSE) - TOffsetDis</tspan><tspan
+         x="110.77113"
+         y="56.657604"
+         style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+         id="tspan12005">for delDis period of time</tspan><tspan
+         x="110.77113"
+         y="62.266766"
+         style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+         id="tspan6940-0-1-39-2" /></text>
+  </g>
+</svg>
diff --git a/Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Generic/PlantEnableStateGraph.png b/Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Generic/PlantEnableStateGraph.png
new file mode 100644
index 00000000000..ccff3ee7b95
Binary files /dev/null and b/Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Generic/PlantEnableStateGraph.png differ
diff --git a/Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Generic/PlantEnableStateGraph.svg b/Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Generic/PlantEnableStateGraph.svg
new file mode 100644
index 00000000000..6434f98eace
--- /dev/null
+++ b/Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Generic/PlantEnableStateGraph.svg
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="141.32527mm"
+   height="80.741295mm"
+   viewBox="0 0 141.32527 80.741295"
+   version="1.1"
+   id="svg12993">
+  <defs
+     id="defs12987">
+    <marker
+       style="overflow:visible"
+       orient="auto"
+       overflow="visible"
+       id="marker5381-6-6">
+      <path
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         id="path4488-0"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       orient="auto"
+       overflow="visible"
+       id="marker5553-0-3">
+      <path
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         id="path4485-1"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata12990">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="translate(-31.3985,-10.275809)">
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.0605999;stroke-opacity:0.666667"
+       id="path4497-0"
+       d="m 100.2663,90.830078 c -8.375801,-0.61621 -15.196261,-2.39412 -18.752101,-4.88815 -1.68806,-1.18398 -2.19323,-1.96494 -2.19323,-3.3907 0,-1.41128 0.49181,-2.18621 2.12819,-3.35329 3.38263,-2.41232 9.55497,-4.08982 17.77255,-4.83022 3.626061,-0.32668 9.451841,-0.34922 13.048171,-0.0505 7.10583,0.59028 12.65528,1.84512 16.44923,3.71963 4.93012,2.43552 5.58369,5.41258 1.76623,8.04545 -3.35077,2.3113 -10.09835,4.06552 -18.05658,4.69441 -3.25256,0.25698 -9.04809,0.28232 -12.16325,0.0529 z" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.279543;marker-end:url(#marker5381-6-6)"
+       id="path4499-2"
+       d="m 106.91544,26.929478 v 47.14102" />
+    <path
+       d="m 96.586829,74.534258 c -14.06492,-22.5854 2.31203,-47.50288 2.31203,-47.50288"
+       id="path4503-4"
+       style="fill:none;stroke:#000000;stroke-width:0.32889px;marker-end:url(#marker5553-0-3)" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.23333px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="104.87664"
+       y="16.097794"
+       id="text4487-8-5-3"><tspan
+         x="104.87664"
+         y="16.097794"
+         style="font-size:4.23333px;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583"
+         id="tspan8823">Enable plant</tspan><tspan
+         x="104.87664"
+         y="21.559782"
+         style="font-size:4.23333px;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583"
+         id="tspan10394"><tspan
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:FreeMono;-inkscape-font-specification:FreeMono"
+   id="tspan13683">plaThrTim</tspan> state hold</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.23333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="31.410902"
+       y="41.261864"
+       id="text4487-4-1-0-3-4"><tspan
+         x="31.410902"
+         y="41.261864"
+         style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+         id="tspan6882">chiWatSupResReq &gt; ignReq</tspan><tspan
+         x="31.410902"
+         y="47.188526"
+         style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+         id="tspan10362">AND</tspan><tspan
+         x="31.410902"
+         y="53.115189"
+         style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+         id="tspan6884">TOut &gt; TChiLocOut</tspan><tspan
+         x="31.410902"
+         y="59.041847"
+         style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+         id="tspan6886">AND</tspan><tspan
+         x="31.410902"
+         y="64.968513"
+         style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+         id="tspan6888">schTab is active</tspan></text>
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.0623623;stroke-opacity:0.666667"
+       id="path4497-0-4"
+       d="m 98.899699,27.031838 c -8.86906,-0.61627 -16.09119,-2.39437 -19.85644,-4.88868 -1.78747,-1.18412 -2.32239,-1.96516 -2.32239,-3.39109 0,-1.41143 0.52078,-2.18645 2.25352,-3.35366 3.58184,-2.412593 10.11768,-4.090273 18.8192,-4.830756 3.839601,-0.326728 10.008471,-0.349259 13.816581,-0.05045 7.52431,0.590342 13.40057,1.845318 17.41794,3.720036 5.22047,2.4358 5.91253,5.41319 1.87026,8.04636 -3.5481,2.31155 -10.69306,4.06597 -19.11996,4.69492 -3.44411,0.25702 -9.58094,0.28235 -12.879551,0.0529 z" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.23333px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="106.69491"
+       y="80.098297"
+       id="text4487-8-5-3-0"><tspan
+         x="106.69491"
+         y="80.098297"
+         style="font-size:4.23333px;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583"
+         id="tspan8823-7">Disable plant</tspan><tspan
+         x="106.69491"
+         y="85.560287"
+         style="font-size:4.23333px;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583"
+         id="tspan10396"><tspan
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:FreeMono;-inkscape-font-specification:'FreeMono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+   id="tspan13695">plaThrTim</tspan> state hold</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.23333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="110.69144"
+       y="39.972519"
+       id="text4487-4-1-0-3-4-1"><tspan
+         x="110.69144"
+         y="39.972519"
+         style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+         id="tspan6882-3">chiWatSupResReq ≤ ignReq</tspan><tspan
+         x="110.69144"
+         y="45.899181"
+         style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+         id="tspan10398">for at least reqThrTim</tspan><tspan
+         x="110.69144"
+         y="51.825844"
+         style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+         id="tspan10362-7">OR</tspan><tspan
+         x="110.69144"
+         y="57.752502"
+         style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+         id="tspan6884-7">TOut ≤ TChiLocOut - locDt</tspan><tspan
+         x="110.69144"
+         y="63.679165"
+         style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+         id="tspan6886-1">OR</tspan><tspan
+         x="110.69144"
+         y="69.605827"
+         style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+         id="tspan6888-2">schTab is inactive</tspan></text>
+  </g>
+  <g
+     id="layer2" />
+  <g
+     id="ltx-render-layer" />
+</svg>
diff --git a/Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/InitialStageSelectionStateGraph.png b/Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/InitialStageSelectionStateGraph.png
new file mode 100644
index 00000000000..bb0afb2c0fe
Binary files /dev/null and b/Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/InitialStageSelectionStateGraph.png differ
diff --git a/Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/InitialStageSelectionStateGraph.svg b/Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/InitialStageSelectionStateGraph.svg
new file mode 100644
index 00000000000..2163442ba39
--- /dev/null
+++ b/Buildings/Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/InitialStageSelectionStateGraph.svg
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="255.24553mm"
+   height="47.927761mm"
+   viewBox="0 0 255.24553 47.927761"
+   version="1.1"
+   id="svg1553">
+  <defs
+     id="defs1547">
+    <marker
+       style="overflow:visible"
+       orient="auto"
+       overflow="visible"
+       id="marker5381-6-6-1">
+      <path
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         id="path4488-0-34"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       orient="auto"
+       overflow="visible"
+       id="marker5553-0-3-9">
+      <path
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         id="path4485-1-4"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       orient="auto"
+       overflow="visible"
+       id="marker5381-6-6-1-5">
+      <path
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         id="path4488-0-34-9"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       orient="auto"
+       overflow="visible"
+       id="marker5553-0-3-9-9">
+      <path
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         id="path4485-1-4-1"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata1550">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.0605999;stroke-opacity:0.666667"
+     id="path4497-0-5"
+     d="m 138.09915,47.697083 c -8.37579,-0.61621 -15.19627,-2.39412 -18.7521,-4.88816 -1.68806,-1.18397 -2.19324,-1.96493 -2.19324,-3.39069 0,-1.41128 0.49182,-2.18621 2.1282,-3.35329 3.38262,-2.41232 9.55498,-4.08982 17.77256,-4.83022 3.62604,-0.32668 9.45184,-0.34922 13.04816,-0.0505 7.10584,0.59028 12.65528,1.84512 16.44924,3.71963 4.93012,2.43553 5.58369,5.41258 1.76623,8.04545 -3.35077,2.3113 -10.09836,4.06552 -18.05659,4.69441 -3.25256,0.25698 -9.0481,0.28232 -12.16326,0.0529 z" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:0.156991;marker-end:url(#marker5381-6-6-1-5)"
+     id="path4499-2-7"
+     d="M 144.92401,16.680978 V 31.203613" />
+  <path
+     d="m 134.34975,31.346483 c -14.39941,-6.957825 2.36702,-14.634105 2.36702,-14.634105"
+     id="path4503-4-4"
+     style="fill:none;stroke:#000000;stroke-width:0.184705px;marker-end:url(#marker5553-0-3-9-9)" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:4.23333px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+     x="144.44223"
+     y="6.9865818"
+     id="text4487-8-5-3-12"><tspan
+       x="144.44223"
+       y="6.9865818"
+       style="font-size:4.23333px;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583"
+       id="tspan10861">Initialize plant in </tspan><tspan
+       x="144.44223"
+       y="12.278245"
+       style="font-size:4.23333px;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583"
+       id="tspan10886">WSE-only mode</tspan></text>
+  <path
+     style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.0623623;stroke-opacity:0.666667"
+     id="path4497-0-4-3"
+     d="m 136.71677,16.712378 c -8.86906,-0.616271 -16.09119,-2.394371 -19.85643,-4.888681 -1.78747,-1.18412 -2.32239,-1.9651597 -2.32239,-3.3910799 0,-1.41144 0.52078,-2.18646 2.25352,-3.35367 3.58183,-2.41259 10.11767,-4.09026997 18.8192,-4.83074996 3.83959,-0.32673 10.00847,-0.34926 13.81658,-0.0505 7.52432,0.59033999 13.40057,1.84531996 17.41795,3.72002996 5.22047,2.4358 5.91253,5.41319 1.87025,8.0463599 -3.54809,2.31155 -10.69306,4.065971 -19.11997,4.69492 -3.4441,0.257021 -9.58093,0.28235 -12.87955,0.0529 z" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:4.23333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+     x="8.5229368"
+     y="24.505747"
+     id="text4487-4-1-0-3-4-1-4-9"><tspan
+       x="8.5229368"
+       y="24.505747"
+       style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+       id="tspan6888-9-3-8">TChiWatSupSet - wseTOut(PLRHeaExc = 1).y &gt;=wseDt </tspan><tspan
+       x="8.5229368"
+       y="30.114908"
+       style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+       id="tspan6940-0-1" /></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:4.23333px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+     x="144.49976"
+     y="37.805672"
+     id="text4487-8-5-3-12-2"><tspan
+       x="144.49976"
+       y="37.805672"
+       style="font-size:4.23333px;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583"
+       id="tspan10861-1">Initialize plant in </tspan><tspan
+       x="144.49976"
+       y="43.097336"
+       style="font-size:4.23333px;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.264583"
+       id="tspan10886-3">chiller-only mode</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:4.23333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+     x="149.61325"
+     y="24.294382"
+     id="text4487-4-1-0-3-4-1-4-9-2"><tspan
+       x="149.61325"
+       y="24.294382"
+       style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+       id="tspan6888-9-3-8-7">TChiWatSupSet &lt; wseTOut(PLRHeaExc = 1).y </tspan><tspan
+       x="149.61325"
+       y="29.903543"
+       style="font-size:4.23333px;line-height:1.4;fill:#000000;stroke-width:0.264583"
+       id="tspan6940-0-1-3" /></text>
+</svg>
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_ChillerPlant_Economizers_Validation_Controller.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_ChillerPlant_Economizers_Validation_Controller.txt
index 6df3f6ca985..7cbaa8d9e71 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_ChillerPlant_Economizers_Validation_Controller.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_ChillerPlant_Economizers_Validation_Controller.txt
@@ -1,4 +1,4 @@
-last-generated=2020-05-11
+last-generated=2021-03-31
 statistics-simulation=
 {
   "linear": " ",
@@ -22,7 +22,7 @@ wseSta1.VChiWat_flow=[9.999999776482582e-03, 9.999999776482582e-03]
 wseSta1.uTowFanSpeMax=[1e+00, 1e+00]
 wseSta1.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 wseSta1.enaTWet.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-wseSta1.enaTChiWatRet.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+wseSta1.enaTChiWatRet.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 wseSta2.TOutWet=[2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02]
 wseSta2.TChiWatRet=[2.931499938964844e+02, 2.931499938964844e+02]
 wseSta2.TChiWatRetDow=[2.901499938964844e+02, 2.906513366699219e+02, 2.911447448730469e+02, 2.916224975585938e+02, 2.920770263671875e+02, 2.925011291503906e+02, 2.9288818359375e+02, 2.932320556640625e+02, 2.935273132324219e+02, 2.937693176269531e+02, 2.939542236328125e+02, 2.940791625976562e+02, 2.941421203613281e+02, 2.941421203613281e+02, 2.940791625976562e+02, 2.939542236328125e+02, 2.937693176269531e+02, 2.935273132324219e+02, 2.932320556640625e+02, 2.9288818359375e+02, 2.925011291503906e+02, 2.920770263671875e+02, 2.916224975585938e+02, 2.911447448730469e+02, 2.906513366699219e+02, 2.901499938964844e+02, 2.89648681640625e+02, 2.891552429199219e+02, 2.88677490234375e+02, 2.882229919433594e+02, 2.877988586425781e+02, 2.874118041992188e+02, 2.870679321289062e+02, 2.867726745605469e+02, 2.865307006835938e+02, 2.863457641601562e+02, 2.862208557128906e+02, 2.861578979492188e+02, 2.861578979492188e+02, 2.862208557128906e+02, 2.863457641601562e+02, 2.865307006835938e+02, 2.867726745605469e+02, 2.870679321289062e+02, 2.874118041992188e+02, 2.877988586425781e+02, 2.882229919433594e+02, 2.88677490234375e+02, 2.891552429199219e+02, 2.89648681640625e+02, 2.901499938964844e+02, 2.906513366699219e+02, 2.911447448730469e+02, 2.916224975585938e+02, 2.920770263671875e+02, 2.925011291503906e+02, 2.9288818359375e+02, 2.932320556640625e+02, 2.935273132324219e+02, 2.937693176269531e+02, 2.939542236328125e+02, 2.940791625976562e+02, 2.941421203613281e+02, 2.941421203613281e+02, 2.940791625976562e+02, 2.939542236328125e+02, 2.937693176269531e+02, 2.935273132324219e+02, 2.932320556640625e+02, 2.9288818359375e+02, 2.925011291503906e+02, 2.920770263671875e+02, 2.916224975585938e+02, 2.911447448730469e+02, 2.906513366699219e+02, 2.901499938964844e+02, 2.89648681640625e+02, 2.891552429199219e+02, 2.88677490234375e+02, 2.882229919433594e+02, 2.877988586425781e+02, 2.874118041992188e+02, 2.870679321289062e+02, 2.867726745605469e+02, 2.865307006835938e+02, 2.863457641601562e+02, 2.862208557128906e+02, 2.861578979492188e+02, 2.861578979492188e+02, 2.862208557128906e+02, 2.863457641601562e+02, 2.865307006835938e+02, 2.867726745605469e+02, 2.870679321289062e+02, 2.874118041992188e+02, 2.877988586425781e+02, 2.882229919433594e+02, 2.88677490234375e+02, 2.891552429199219e+02, 2.89648681640625e+02, 2.901499938964844e+02]
@@ -30,4 +30,4 @@ wseSta2.VChiWat_flow=[9.999999776482582e-03, 9.999999776482582e-03]
 wseSta2.uTowFanSpeMax=[1e+00, 1e+00]
 wseSta2.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 wseSta2.enaTWet.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-wseSta2.enaTChiWatRet.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+wseSta2.enaTChiWatRet.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_ChillerPlant_Staging_SetPoints_Subsequences_Validation_PartLoadRatios_u_uTyp.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_ChillerPlant_Staging_SetPoints_Subsequences_Validation_PartLoadRatios_u_uTyp.txt
index f1261180461..ab3ba2d6e44 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_ChillerPlant_Staging_SetPoints_Subsequences_Validation_PartLoadRatios_u_uTyp.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_ChillerPlant_Staging_SetPoints_Subsequences_Validation_PartLoadRatios_u_uTyp.txt
@@ -1,8 +1,9 @@
-last-generated=2020-05-29
+last-generated=2021-03-25
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
+  "number of continuous time states": "4",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.2e+03]