diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/AHU.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/AHU.mo
index c1dc0ae8154..39413e75c34 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/AHU.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/AHU.mo
@@ -117,8 +117,7 @@ protected
     annotation (Placement(transformation(extent={{-120,-20},{-100,0}})));
 
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar(
-    final p=1,
-    final k=1)
+    final p=1)
     "System outdoor air flow fraction plus 1"
     annotation (Placement(transformation(extent={{-80,-20},{-60,0}})));
 
@@ -146,8 +145,7 @@ protected
     annotation (Placement(transformation(extent={{60,120},{80,140}})));
 
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1(
-    final p=1,
-    final k=1)
+    final p=1)
     "Average outdoor air flow fraction plus 1"
     annotation (Placement(transformation(extent={{120,120},{140,140}})));
 
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Supply.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Supply.mo
index 47d102efcaf..cea3f572f58 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Supply.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Supply.mo
@@ -72,9 +72,9 @@ block Supply "Supply air set point for single zone VAV system"
   Buildings.Controls.OBC.CDL.Continuous.Switch switch "Switch to assign control signal"
     annotation (Placement(transformation(extent={{120,-70},{140,-50}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant fanOff(k=0) "Fan off status"
-    annotation (Placement(transformation(extent={{40,10},{60,30}})));
+    annotation (Placement(transformation(extent={{80,10},{100,30}})));
   Buildings.Controls.OBC.CDL.Continuous.Min yFanHeaCoo "Fan speed due to heating or cooling"
-    annotation (Placement(transformation(extent={{90,-40},{110,-20}})));
+    annotation (Placement(transformation(extent={{80,-40},{100,-20}})));
 protected
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant one(final k=1) "Maximum fan speed"
     annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
@@ -95,15 +95,19 @@ protected
     annotation (Placement(transformation(extent={{60,110},{80,130}})));
   Buildings.Controls.OBC.CDL.Continuous.Subtract dT
     "Difference zone minus outdoor temperature"
-    annotation (Placement(transformation(extent={{-70,-128},{-50,-108}})));
+    annotation (Placement(transformation(extent={{-70,-130},{-50,-110}})));
+  Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1(
+    final k=(yMin - yCooMax)/(0.56 - 5.6))
+    "Gain factor"
+    annotation (Placement(transformation(extent={{-40,-130},{-20,-110}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter yMed(
-    final p=yCooMax - (yMin - yCooMax)/(0.56 - 5.6)*5.6,
-    final k=(yMin - yCooMax)/(0.56 - 5.6)) "Fan speed at medium cooling load"
-    annotation (Placement(transformation(extent={{-30,-128},{-10,-108}})));
+    final p=yCooMax - (yMin - yCooMax)/(0.56 - 5.6)*5.6)
+    "Fan speed at medium cooling load"
+    annotation (Placement(transformation(extent={{-8,-130},{12,-110}})));
   Buildings.Controls.OBC.CDL.Continuous.Limiter yMedLim(
     final uMax=yCooMax,
     final uMin=yMin) "Limiter for yMed"
-    annotation (Placement(transformation(extent={{0,-128},{20,-108}})));
+    annotation (Placement(transformation(extent={{28,-130},{48,-110}})));
   Buildings.Controls.OBC.CDL.Continuous.Limiter TDea(
     final uMax=24 + 273.15,
     final uMin=21 + 273.15)
@@ -133,11 +137,14 @@ protected
   Buildings.Controls.OBC.CDL.Continuous.Subtract TDeaTSupSetMin
     "Outputs TDea-TSupSetMin"
     annotation (Placement(transformation(extent={{-20,0},{0,20}})));
-  Buildings.Controls.OBC.CDL.Continuous.AddParameter addTDea(
-    final p=-1.1,
+  Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai(
     final k=-1)
-    "Adds constant offset"
+    "Gain factor"
     annotation (Placement(transformation(extent={{10,0},{30,20}})));
+  Buildings.Controls.OBC.CDL.Continuous.AddParameter addTDea(
+    final p=-1.1)
+    "Adds constant offset"
+    annotation (Placement(transformation(extent={{40,0},{60,20}})));
   Buildings.Controls.OBC.CDL.Continuous.Subtract TSupSetMaxTDea
     "Outputs TSupSetMax-TDea"
     annotation (Placement(transformation(extent={{-20,40},{0,60}})));
@@ -178,9 +185,9 @@ protected
     final k=0) "Constant signal"
     annotation (Placement(transformation(extent={{0,-350},{20,-330}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter yOffSet(
-    final p=-yMin, k=1)
+    final p=-yMin)
     "Subtract yMin so that all control signals can be added"
-    annotation (Placement(transformation(extent={{36,-128},{56,-108}})));
+    annotation (Placement(transformation(extent={{60,-130},{80,-110}})));
   Buildings.Controls.OBC.CDL.Continuous.Add addHeaCoo
     "Add heating control signal and offset due to cooling"
     annotation (Placement(transformation(extent={{40,-70},{60,-50}})));
@@ -226,16 +233,13 @@ equation
     annotation (Line(points={{82,120},{84,120},{84,40},{180,40}},
       color={0,0,127}));
   connect(dT.u1, TZon)
-    annotation (Line(points={{-72,-112},{-86,-112},{-86,-10},{-120,-10}},
+    annotation (Line(points={{-72,-114},{-86,-114},{-86,-10},{-120,-10}},
       color={0,0,127}));
   connect(dT.u2, TOut)
-    annotation (Line(points={{-72,-124},{-88,-124},{-88,-80},{-120,-80}},
-      color={0,0,127}));
-  connect(dT.y, yMed.u)
-    annotation (Line(points={{-48,-118},{-32,-118}},
+    annotation (Line(points={{-72,-126},{-88,-126},{-88,-80},{-120,-80}},
       color={0,0,127}));
   connect(yMedLim.u, yMed.y)
-    annotation (Line(points={{-2,-118},{-8,-118}},   color={0,0,127}));
+    annotation (Line(points={{26,-120},{14,-120}},   color={0,0,127}));
   connect(TDea.u, TZonSet)
     annotation (Line(points={{-82,30},{-120,30}},        color={0,0,127}));
   connect(TDea.y, TSetHeaHig.f1)
@@ -249,8 +253,7 @@ equation
       color={0,0,127}));
   connect(uHea, TSetHeaHig.u)
     annotation (Line(points={{-120,110},{-88,110},{-88,102},{-36,102},{-36,220},
-          {0,220}},
-                color={0,0,127}));
+          {0,220}}, color={0,0,127}));
   connect(TSetHeaHig.y, addTHe.u1)
     annotation (Line(points={{24,220},{40,220},{40,206},{58,206}},
       color={0,0,127}));
@@ -269,10 +272,8 @@ equation
   connect(conTSupSetMin.y, TDeaTSupSetMin.u2)
     annotation (Line(points={{-58,0},{-40,0},{-40,4},{-22,4}},
       color={0,0,127}));
-  connect(TDeaTSupSetMin.y, addTDea.u)
-    annotation (Line(points={{2,10},{8,10}},            color={0,0,127}));
   connect(addTDea.y, offSetTSetHea.f2)
-    annotation (Line(points={{32,10},{34,10},{34,70},{-14,70},{-14,172},{-2,172}},
+    annotation (Line(points={{62,10},{70,10},{70,70},{-14,70},{-14,172},{-2,172}},
       color={0,0,127}));
   connect(TSetCooHig.x1, con05.y)
     annotation (Line(points={{-2,148},{-30,148},{-30,150},{-58,150}},
@@ -315,21 +316,21 @@ equation
   connect(uCoo, lin075.u) annotation (Line(points={{-120,70},{-90,70},{-90,-252},
           {24,-252},{24,-284},{32,-284}}, color={0,0,127}));
   connect(yMedLim.y, yOffSet.u)
-    annotation (Line(points={{22,-118},{34,-118}}, color={0,0,127}));
+    annotation (Line(points={{50,-120},{58,-120}}, color={0,0,127}));
   connect(dY075.u2, yOffSet.y) annotation (Line(points={{-38,-290},{-42,-290},{-42,
-          -160},{70,-160},{70,-118},{58,-118}}, color={0,0,127}));
+          -160},{94,-160},{94,-120},{82,-120}}, color={0,0,127}));
   connect(offCoo.u1, lin050.y) annotation (Line(points={{38,-186},{20,-186},{20,
           -192},{2,-192}}, color={0,0,127}));
   connect(offCoo.u2, lin075.y) annotation (Line(points={{38,-198},{34,-198},{34,
           -256},{60,-256},{60,-284},{56,-284}}, color={0,0,127}));
-  connect(offCoo.y, addHeaCoo.u2) annotation (Line(points={{62,-192},{90,-192},{
-          90,-80},{30,-80},{30,-66},{38,-66}}, color={0,0,127}));
+  connect(offCoo.y, addHeaCoo.u2) annotation (Line(points={{62,-192},{100,-192},
+          {100,-80},{30,-80},{30,-66},{38,-66}}, color={0,0,127}));
   connect(lin050.x2, con1.y) annotation (Line(points={{-22,-196},{-46,-196},{-46,
           -222},{-58,-222}}, color={0,0,127}));
   connect(con025.y, lin050.x1) annotation (Line(points={{-58,-166},{-52,-166},{-52,
           -184},{-22,-184}}, color={0,0,127}));
   connect(lin050.f2, yOffSet.y) annotation (Line(points={{-22,-200},{-42,-200},{
-          -42,-160},{70,-160},{70,-118},{58,-118}}, color={0,0,127}));
+          -42,-160},{94,-160},{94,-120},{82,-120}}, color={0,0,127}));
   connect(con3.y, lin050.f1) annotation (Line(points={{-58,-196},{-50,-196},{-50,
           -188},{-22,-188}}, color={0,0,127}));
   connect(dY075.y, lin075.f2) annotation (Line(points={{-14,-284},{-8,-284},{-8,
@@ -339,8 +340,7 @@ equation
   connect(TSetHeaHig.x1, con0.y) annotation (Line(points={{0,228},{-56,228},{-56,
           220},{-58,220}}, color={0,0,127}));
   connect(con7.y, yHea.x1) annotation (Line(points={{-18,-30},{-6,-30},{-6,-42},
-          {2,-42}},
-                 color={0,0,127}));
+          {2,-42}}, color={0,0,127}));
   connect(minSpe.y, yHea.f1) annotation (Line(points={{-58,-30},{-56,-30},{-56,-46},
           {2,-46}},  color={0,0,127}));
   connect(uHea, yHea.u) annotation (Line(points={{-120,110},{-94,110},{-94,-50},
@@ -348,25 +348,30 @@ equation
   connect(conOne.y, yHea.x2) annotation (Line(points={{-58,-70},{-56,-70},{-56,-54},
           {2,-54}},  color={0,0,127}));
   connect(maxHeaSpe.y, yHea.f2) annotation (Line(points={{-18,-70},{-6,-70},{-6,
-          -58},{2,-58}},
-                     color={0,0,127}));
+          -58},{2,-58}}, color={0,0,127}));
   connect(yHea.y, addHeaCoo.u1) annotation (Line(points={{26,-50},{32,-50},{32,-54},
           {38,-54}}, color={0,0,127}));
-
   connect(uFan, switch.u2) annotation (Line(points={{-120,-140},{106,-140},{106,
-          -60},{118,-60}},
-                     color={255,0,255}));
+          -60},{118,-60}}, color={255,0,255}));
   connect(fanOff.y, switch.u3)
-    annotation (Line(points={{62,20},{74,20},{74,-68},{118,-68}},
-                                                          color={0,0,127}));
+    annotation (Line(points={{102,20},{112,20},{112,-68},{118,-68}}, color={0,0,127}));
   connect(switch.y, y) annotation (Line(points={{142,-60},{180,-60}},
                  color={0,0,127}));
-  connect(one.y, yFanHeaCoo.u1) annotation (Line(points={{62,-20},{80,-20},{80,-24},
-          {88,-24}}, color={0,0,127}));
-  connect(addHeaCoo.y, yFanHeaCoo.u2) annotation (Line(points={{62,-60},{80,-60},
-          {80,-36},{88,-36}}, color={0,0,127}));
-  connect(yFanHeaCoo.y, switch.u1) annotation (Line(points={{112,-30},{116,-30},
+  connect(one.y, yFanHeaCoo.u1) annotation (Line(points={{62,-20},{70,-20},{70,-24},
+          {78,-24}}, color={0,0,127}));
+  connect(addHeaCoo.y, yFanHeaCoo.u2) annotation (Line(points={{62,-60},{70,-60},
+          {70,-36},{78,-36}}, color={0,0,127}));
+  connect(yFanHeaCoo.y, switch.u1) annotation (Line(points={{102,-30},{116,-30},
           {116,-52},{118,-52}}, color={0,0,127}));
+  connect(TDeaTSupSetMin.y, gai.u)
+    annotation (Line(points={{2,10},{8,10}}, color={0,0,127}));
+  connect(gai.y, addTDea.u)
+    annotation (Line(points={{32,10},{38,10}}, color={0,0,127}));
+  connect(dT.y, gai1.u)
+    annotation (Line(points={{-48,-120},{-42,-120}}, color={0,0,127}));
+  connect(gai1.y, yMed.u)
+    annotation (Line(points={{-18,-120},{-10,-120}}, color={0,0,127}));
+
 annotation (
   defaultComponentName = "setPoiVAV",
  Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-120},{100,120}}),
@@ -503,12 +508,12 @@ annotation (
           fillPattern=FillPattern.Solid,
           textString="0.75 < yCoo < 1"),
         Rectangle(
-          extent={{-84,-100},{80,-138}},
+          extent={{-76,-100},{88,-138}},
           lineColor={0,0,0},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid),
         Text(
-          extent={{28,-142},{64,-124}},
+          extent={{46,-142},{82,-124}},
           textColor={0,0,0},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
@@ -525,7 +530,7 @@ annotation (
           fillPattern=FillPattern.Solid,
           textString="heating"),
         Text(
-          extent={{-82,-98},{88,-90}},
+          extent={{-74,-98},{96,-90}},
           textColor={0,0,0},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/FreezeProtectionMixedAir.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/FreezeProtectionMixedAir.mo
index a43152052de..b8987f6396a 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/FreezeProtectionMixedAir.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/FreezeProtectionMixedAir.mo
@@ -56,9 +56,12 @@ protected
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant setPoi(final k=TFreSet)
     "Set point for freeze protection"
     annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
-  Buildings.Controls.OBC.CDL.Continuous.AddParameter yOut(final p=1, final k=-1)
+  Buildings.Controls.OBC.CDL.Continuous.Subtract yOut
     "Freeze protection control signal inverter"
     annotation (Placement(transformation(extent={{60,20},{80,40}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant one(
+    final k=1) "Constant 1"
+    annotation (Placement(transformation(extent={{20,60},{40,80}})));
 
 equation
   connect(con.u_s, setPoi.y)
@@ -69,8 +72,10 @@ equation
     annotation (Line(points={{-120,0},{-10,0},{-10,18}}, color={0,0,127}));
   connect(con.y, yFrePro) annotation (Line(points={{2,30},{30,30},{30,-30},{120,
           -30}}, color={0,0,127}));
-  connect(con.y, yOut.u) annotation (Line(points={{2,30},{30,30},{30,30},{58,30}},
-        color={0,0,127}));
+  connect(con.y, yOut.u2) annotation (Line(points={{2,30},{30,30},{30,24},{58,
+          24}}, color={0,0,127}));
+  connect(one.y, yOut.u1) annotation (Line(points={{42,70},{50,70},{50,36},{58,
+          36}}, color={0,0,127}));
   annotation (Dialog(
     enable=controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
         or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID),
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/GroupStatus.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/GroupStatus.mo
index 9bfb098a6f2..c5089d1a72d 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/GroupStatus.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/GroupStatus.mo
@@ -7,45 +7,48 @@ model GroupStatus
     numZonGro=2,
     zonGroMsk={true,false,true})
     "Calculate zone group status"
-    annotation (Placement(transformation(extent={{122,-58},{142,-18}})));
+    annotation (Placement(transformation(extent={{120,-60},{140,-20}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant warUpTim[3](
     final k={1800,1700,1900})
     "Warm-up time"
-    annotation (Placement(transformation(extent={{-98,-28},{-78,-8}})));
+    annotation (Placement(transformation(extent={{-100,-30},{-80,-10}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooDowTim[3](
     final k={1600,1700,1800})
     "Cooling down time"
-    annotation (Placement(transformation(extent={{-138,-8},{-118,12}})));
+    annotation (Placement(transformation(extent={{-140,-10},{-120,10}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse winSta[3](
     final width={0.3,0.2,0.1},
     final period=fill(3600, 3),
     final shift={150,130,120})
     "Window status"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-46,-298})));
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-50,-300})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2(
     final offset=0,
     final height=6.2831852,
     final duration=24*3600) "Block that generates ramp signal"
-    annotation (Placement(transformation(extent={{-138,-218},{-118,-198}})));
+    annotation (Placement(transformation(extent={{-140,-220},{-120,-200}})));
   Buildings.Controls.OBC.CDL.Continuous.Sin sin2
     "Block that outputs the sine of the input"
-    annotation (Placement(transformation(extent={{-98,-218},{-78,-198}})));
+    annotation (Placement(transformation(extent={{-100,-220},{-80,-200}})));
+  Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai(
+    final k=6)
+    "Current zone temperature"
+    annotation (Placement(transformation(extent={{-60,-220},{-40,-200}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter zonTem(
-    final k=6,
     final p=273.15 + 22.5)
     "Current zone temperature"
-    annotation (Placement(transformation(extent={{-58,-218},{-38,-198}})));
+    annotation (Placement(transformation(extent={{-20,-220},{0,-200}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Constant uOccOve[3](
     final k=fill(false,3))
     "Occupancy local override"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-130,180})));
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={70,180})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse zonOcc1(
     final width=0.8,
     final period=7200,
     shift=1800)
     "Zone 1 occupied status"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-90,160})));
- Buildings.Controls.OBC.CDL.Logical.Sources.Pulse zonOcc3(
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse zonOcc3(
     final width=0.8,
     final period=7200,
     shift=2100) "Zone 3 occupied status"
@@ -58,62 +61,60 @@ model GroupStatus
     annotation (Placement(transformation(extent={{-20,130},{0,150}})));
   Buildings.Controls.OBC.CDL.Logical.Timer tim3 "Time after input becomes true"
     annotation (Placement(transformation(extent={{-20,10},{0,30}})));
-  Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1(
-    final p=1800,
-    final k=-1) "Time to occupied period"
+  Buildings.Controls.OBC.CDL.Continuous.Subtract addPar1
+    "Time to occupied period"
     annotation (Placement(transformation(extent={{20,130},{40,150}})));
-  Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar3(
-    final p=2100,
-    final k=-1) "Time to occupied period"
+  Buildings.Controls.OBC.CDL.Continuous.Subtract addPar3
+    "Time to occupied period"
     annotation (Placement(transformation(extent={{20,10},{40,30}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse lowOccHea[3](
     final width=fill(0.5, 3),
     final period=fill(3600, 3),
     final shift=fill(1000, 3)) "Lower than occupied heating setpoint"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},
-      origin={-128,-38})));
+      origin={-130,-40})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Constant higOccCoo[3](
     final k=fill(false, 3))
     "Higher than occupied cooling setpoint"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-88,-58})));
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-90,-60})));
   Buildings.Controls.OBC.CDL.Logical.And and2[3]
     "Lower than occupied heating setpoint when it is not occupied"
-    annotation (Placement(transformation(extent={{-18,-48},{2,-28}})));
+    annotation (Placement(transformation(extent={{-20,-50},{0,-30}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse lowUnoHea1[3](
     final width=fill(0.1, 3),
     final period=fill(3600, 3))
     "Lower than unoccupied heating setpoint"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-128,-78})));
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-130,-80})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaSetOff[3](
     final k={285.15,282.15,283.15})
     "Unoccupied heating setpoint"
-    annotation (Placement(transformation(extent={{-98,-108},{-78,-88}})));
+    annotation (Placement(transformation(extent={{-100,-110},{-80,-90}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse endSetBac[3](
     final width=fill(0.8, 3),
     final period=fill(3600, 3),
     final shift=fill(900, 3)) "End setback"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-128,-118})));
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-130,-120})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Constant higUnoCoo[3](
     final k=fill(false, 3))
     "HIgher than unoccupied cooling setpoint"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-88,-138})));
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-90,-140})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooSetOff[3](
     final k={303.15,304.15,305.15})
     "Unoccupied cooling setpoint"
-    annotation (Placement(transformation(extent={{-138,-168},{-118,-148}})));
+    annotation (Placement(transformation(extent={{-140,-170},{-120,-150}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Constant endSetUp[3](
     final k=fill(false,3))
     "End setup mode"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-88,-178})));
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-90,-180})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse zonTem3(
     final amplitude=7,
     final period=600,
     final offset=273.15 + 19) "Zone 3 temperature"
-    annotation (Placement(transformation(extent={{-78,-278},{-58,-258}})));
+    annotation (Placement(transformation(extent={{-80,-280},{-60,-260}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zonTem2(
     final k=273.15 + 20)
     "Zone 2 temperature"
-    annotation (Placement(transformation(extent={{-118,-258},{-98,-238}})));
+    annotation (Placement(transformation(extent={{-120,-260},{-100,-240}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Constant zonOcc2(
     final k=true)
     "Zone 2 occupied status"
@@ -122,83 +123,96 @@ model GroupStatus
     "Logical not"
     annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant tNexOcc2(
-    final k=0)
-    "Zone 2 next occupancy time"
-    annotation (Placement(transformation(extent={{20,60},{40,80}})));
+    final k=0) "Zone 2 next occupancy time"
+    annotation (Placement(transformation(extent={{40,60},{60,80}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con(
+    final k=1800)
+    "Constant"
+    annotation (Placement(transformation(extent={{-20,170},{0,190}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con1(
+    final k=2100)
+    "Constant"
+    annotation (Placement(transformation(extent={{-20,60},{0,80}})));
 
 equation
   connect(ramp2.y,sin2. u)
-    annotation (Line(points={{-116,-208},{-100,-208}}, color={0,0,127}));
-  connect(sin2.y, zonTem.u)
-    annotation (Line(points={{-76,-208},{-60,-208}}, color={0,0,127}));
+    annotation (Line(points={{-118,-210},{-102,-210}}, color={0,0,127}));
   connect(not1.y, tim1.u)
     annotation (Line(points={{-38,140},{-22,140}}, color={255,0,255}));
   connect(not3.y,tim3. u)
     annotation (Line(points={{-38,20},{-22,20}},   color={255,0,255}));
-  connect(tim1.y, addPar1.u)
-    annotation (Line(points={{2,140},{18,140}}, color={0,0,127}));
-  connect(tim3.y,addPar3. u)
-    annotation (Line(points={{2,20},{18,20}},   color={0,0,127}));
-  connect(uOccOve.y, zonGroSta.zonOcc) annotation (Line(points={{-118,180},{102,
-          180},{102,-19},{120,-19}}, color={255,0,255}));
-  connect(zonOcc1.y, not1.u) annotation (Line(points={{-78,160},{-70,160},{-70,140},
+  connect(uOccOve.y, zonGroSta.zonOcc) annotation (Line(points={{82,180},{100,180},
+          {100,-21},{118,-21}},      color={255,0,255}));
+  connect(zonOcc1.y, not1.u) annotation (Line(points={{-78,160},{-72,160},{-72,140},
           {-62,140}}, color={255,0,255}));
-  connect(zonOcc3.y,not3. u) annotation (Line(points={{-78,40},{-70,40},{-70,20},
+  connect(zonOcc3.y,not3. u) annotation (Line(points={{-78,40},{-72,40},{-72,20},
           {-62,20}},  color={255,0,255}));
-  connect(zonOcc1.y, zonGroSta.uOcc[1]) annotation (Line(points={{-78,160},{100,
-          160},{100,-22.3333},{120,-22.3333}}, color={255,0,255}));
-  connect(zonOcc3.y, zonGroSta.uOcc[3]) annotation (Line(points={{-78,40},{100,
-          40},{100,-36},{120,-36},{120,-19.6667}},
+  connect(zonOcc1.y, zonGroSta.uOcc[1]) annotation (Line(points={{-78,160},{98,
+          160},{98,-24.3333},{118,-24.3333}},  color={255,0,255}));
+  connect(zonOcc3.y, zonGroSta.uOcc[3]) annotation (Line(points={{-78,40},{98,
+          40},{98,-38},{118,-38},{118,-21.6667}},
                                                color={255,0,255}));
   connect(addPar1.y, zonGroSta.tNexOcc[1]) annotation (Line(points={{42,140},{
-          96,140},{96,-24.3333},{120,-24.3333}},
+          94,140},{94,-26.3333},{118,-26.3333}},
                                               color={0,0,127}));
-  connect(addPar3.y, zonGroSta.tNexOcc[3]) annotation (Line(points={{42,20},{94,
-          20},{94,-21.6667},{120,-21.6667}}, color={0,0,127}));
-  connect(cooDowTim.y, zonGroSta.uCooTim) annotation (Line(points={{-116,2},{92,
-          2},{92,-27},{120,-27}},color={0,0,127}));
-  connect(warUpTim.y, zonGroSta.uWarTim) annotation (Line(points={{-76,-18},{90,
-          -18},{90,-29},{120,-29}}, color={0,0,127}));
-  connect(not1.y, and2[1].u2) annotation (Line(points={{-38,140},{-28,140},{-28,
-          -46},{-20,-46}}, color={255,0,255}));
-  connect(not3.y, and2[3].u2) annotation (Line(points={{-38,20},{-30,20},{-30,
-          -46},{-20,-46}}, color={255,0,255}));
+  connect(addPar3.y, zonGroSta.tNexOcc[3]) annotation (Line(points={{42,20},{92,
+          20},{92,-23.6667},{118,-23.6667}}, color={0,0,127}));
+  connect(cooDowTim.y, zonGroSta.uCooTim) annotation (Line(points={{-118,0},{90,
+          0},{90,-29},{118,-29}},color={0,0,127}));
+  connect(warUpTim.y, zonGroSta.uWarTim) annotation (Line(points={{-78,-20},{88,
+          -20},{88,-31},{118,-31}}, color={0,0,127}));
+  connect(not1.y, and2[1].u2) annotation (Line(points={{-38,140},{-34,140},{-34,
+          -48},{-22,-48}}, color={255,0,255}));
+  connect(not3.y, and2[3].u2) annotation (Line(points={{-38,20},{-30,20},{-30,-48},
+          {-22,-48}},      color={255,0,255}));
   connect(lowOccHea.y, and2.u1)
-    annotation (Line(points={{-116,-38},{-20,-38}}, color={255,0,255}));
-  connect(and2.y, zonGroSta.uOccHeaHig) annotation (Line(points={{4,-38},{22,
-          -38},{22,-33},{120,-33}}, color={255,0,255}));
-  connect(higOccCoo.y, zonGroSta.uHigOccCoo) annotation (Line(points={{-76,-58},
-          {24,-58},{24,-35},{120,-35}}, color={255,0,255}));
-  connect(lowUnoHea1.y, zonGroSta.uUnoHeaHig) annotation (Line(points={{-116,
-          -78},{26,-78},{26,-39},{120,-39}}, color={255,0,255}));
-  connect(heaSetOff.y, zonGroSta.THeaSetOff) annotation (Line(points={{-76,-98},
-          {28,-98},{28,-41},{120,-41}}, color={0,0,127}));
-  connect(endSetBac.y, zonGroSta.uEndSetBac) annotation (Line(points={{-116,
-          -118},{30,-118},{30,-43},{120,-43}}, color={255,0,255}));
-  connect(higUnoCoo.y, zonGroSta.uHigUnoCoo) annotation (Line(points={{-76,-138},
-          {32,-138},{32,-47},{120,-47}}, color={255,0,255}));
-  connect(cooSetOff.y, zonGroSta.TCooSetOff) annotation (Line(points={{-116,
-          -158},{34,-158},{34,-49},{120,-49}}, color={0,0,127}));
-  connect(endSetUp.y, zonGroSta.uEndSetUp) annotation (Line(points={{-76,-178},
-          {36,-178},{36,-51},{120,-51}}, color={255,0,255}));
-  connect(zonTem.y, zonGroSta.TZon[1]) annotation (Line(points={{-36,-208},{38,
-          -208},{38,-56.3333},{120,-56.3333}},
+    annotation (Line(points={{-118,-40},{-22,-40}}, color={255,0,255}));
+  connect(and2.y, zonGroSta.uOccHeaHig) annotation (Line(points={{2,-40},{20,-40},
+          {20,-35},{118,-35}},      color={255,0,255}));
+  connect(higOccCoo.y, zonGroSta.uHigOccCoo) annotation (Line(points={{-78,-60},
+          {22,-60},{22,-37},{118,-37}}, color={255,0,255}));
+  connect(lowUnoHea1.y, zonGroSta.uUnoHeaHig) annotation (Line(points={{-118,-80},
+          {24,-80},{24,-41},{118,-41}},      color={255,0,255}));
+  connect(heaSetOff.y, zonGroSta.THeaSetOff) annotation (Line(points={{-78,-100},
+          {26,-100},{26,-43},{118,-43}},color={0,0,127}));
+  connect(endSetBac.y, zonGroSta.uEndSetBac) annotation (Line(points={{-118,-120},
+          {28,-120},{28,-45},{118,-45}},       color={255,0,255}));
+  connect(higUnoCoo.y, zonGroSta.uHigUnoCoo) annotation (Line(points={{-78,-140},
+          {30,-140},{30,-49},{118,-49}}, color={255,0,255}));
+  connect(cooSetOff.y, zonGroSta.TCooSetOff) annotation (Line(points={{-118,-160},
+          {32,-160},{32,-51},{118,-51}},       color={0,0,127}));
+  connect(endSetUp.y, zonGroSta.uEndSetUp) annotation (Line(points={{-78,-180},{
+          34,-180},{34,-53},{118,-53}},  color={255,0,255}));
+  connect(zonTem.y, zonGroSta.TZon[1]) annotation (Line(points={{2,-210},{36,
+          -210},{36,-58.3333},{118,-58.3333}},
                                          color={0,0,127}));
-  connect(zonTem3.y, zonGroSta.TZon[3]) annotation (Line(points={{-56,-268},{
-          106,-268},{106,-58},{120,-58},{120,-53.6667}},
+  connect(zonTem3.y, zonGroSta.TZon[3]) annotation (Line(points={{-58,-270},{
+          104,-270},{104,-60},{118,-60},{118,-55.6667}},
                                                      color={0,0,127}));
-  connect(winSta.y, zonGroSta.uWin) annotation (Line(points={{-34,-298},{120,
-          -298},{120,-57}},  color={255,0,255}));
-  connect(zonTem2.y, zonGroSta.TZon[2]) annotation (Line(points={{-96,-248},{82,
-          -248},{82,-58},{120,-58},{120,-55}}, color={0,0,127}));
-  connect(zonOcc2.y, not2.u) annotation (Line(points={{-78,100},{-70,100},{-70,
-          80},{-62,80}}, color={255,0,255}));
-  connect(not2.y, and2[2].u2) annotation (Line(points={{-38,80},{-28,80},{-28,
-          -46},{-20,-46}}, color={255,0,255}));
-  connect(zonOcc2.y, zonGroSta.uOcc[2]) annotation (Line(points={{-78,100},{100,
-          100},{100,-21},{120,-21}}, color={255,0,255}));
-  connect(tNexOcc2.y, zonGroSta.tNexOcc[2]) annotation (Line(points={{42,70},{
-          96,70},{96,-23},{120,-23}}, color={0,0,127}));
+  connect(winSta.y, zonGroSta.uWin) annotation (Line(points={{-38,-300},{118,-300},
+          {118,-59}},        color={255,0,255}));
+  connect(zonTem2.y, zonGroSta.TZon[2]) annotation (Line(points={{-98,-250},{80,
+          -250},{80,-60},{118,-60},{118,-57}}, color={0,0,127}));
+  connect(zonOcc2.y, not2.u) annotation (Line(points={{-78,100},{-72,100},{-72,80},
+          {-62,80}},     color={255,0,255}));
+  connect(not2.y, and2[2].u2) annotation (Line(points={{-38,80},{-26,80},{-26,-48},
+          {-22,-48}},      color={255,0,255}));
+  connect(zonOcc2.y, zonGroSta.uOcc[2]) annotation (Line(points={{-78,100},{98,100},
+          {98,-23},{118,-23}},       color={255,0,255}));
+  connect(tNexOcc2.y, zonGroSta.tNexOcc[2]) annotation (Line(points={{62,70},{94,
+          70},{94,-25},{118,-25}},    color={0,0,127}));
+  connect(con.y, addPar1.u1) annotation (Line(points={{2,180},{10,180},{10,146},
+          {18,146}}, color={0,0,127}));
+  connect(tim1.y, addPar1.u2) annotation (Line(points={{2,140},{10,140},{10,134},
+          {18,134}}, color={0,0,127}));
+  connect(con1.y, addPar3.u1) annotation (Line(points={{2,70},{10,70},{10,26},{18,
+          26}}, color={0,0,127}));
+  connect(tim3.y, addPar3.u2) annotation (Line(points={{2,20},{10,20},{10,14},{18,
+          14}}, color={0,0,127}));
+  connect(sin2.y, gai.u)
+    annotation (Line(points={{-78,-210},{-62,-210}}, color={0,0,127}));
+  connect(gai.y, zonTem.u)
+    annotation (Line(points={{-38,-210},{-22,-210}}, color={0,0,127}));
 
 annotation (
   experiment(StopTime=3600, Tolerance=1e-6),
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/OperationMode.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/OperationMode.mo
index 6a171454de1..e6a095fbcf3 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/OperationMode.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/OperationMode.mo
@@ -13,11 +13,13 @@ model OperationMode "Validate block for selecting operation mode"
     annotation (Placement(transformation(extent={{-140,40},{-120,60}})));
   Buildings.Controls.OBC.CDL.Continuous.Sin sin1
     "Block that outputs the sine of the input"
-    annotation (Placement(transformation(extent={{-100,40},{-80,60}})));
+    annotation (Placement(transformation(extent={{-110,40},{-90,60}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter zonTem(
-    final k=14.5,
     final p=295.65) "Zone temperarure"
-    annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
+    annotation (Placement(transformation(extent={{-50,40},{-30,60}})));
+  Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai(
+    final k=14.5) "Gain factor"
+    annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonHeaSetUno(
     final k=285.15)  "Unoccupied heating setpoint"
     annotation (Placement(transformation(extent={{-100,-40},{-80,-20}})));
@@ -76,34 +78,32 @@ model OperationMode "Validate block for selecting operation mode"
 
 equation
   connect(ramp1.y, sin1.u)
-    annotation (Line(points={{-118,50},{-102,50}}, color={0,0,127}));
-  connect(sin1.y,zonTem. u)
-    annotation (Line(points={{-78,50},{-62,50}},  color={0,0,127}));
+    annotation (Line(points={{-118,50},{-112,50}}, color={0,0,127}));
   connect(cooDowTim.y, opeModSel.maxCooDowTim) annotation (Line(points={{-118,130},
           {30,130},{30,110},{118,110}}, color={0,0,127}));
   connect(warUpTim.y, opeModSel.maxWarUpTim) annotation (Line(points={{-78,110},
           {-60,110},{-60,106},{118,106}}, color={0,0,127}));
   connect(TZonHeaSetOcc.y, lowThaHeaSet.u1)
     annotation (Line(points={{-118,80},{-2,80}}, color={0,0,127}));
-  connect(zonTem.y, lowThaHeaSet.u2) annotation (Line(points={{-38,50},{-20,50},
+  connect(zonTem.y, lowThaHeaSet.u2) annotation (Line(points={{-28,50},{-20,50},
           {-20,72},{-2,72}}, color={0,0,127}));
-  connect(zonTem.y, higThaCooSet.u1) annotation (Line(points={{-38,50},{-20,50},
+  connect(zonTem.y, higThaCooSet.u1) annotation (Line(points={{-28,50},{-20,50},
           {-20,30},{-2,30}}, color={0,0,127}));
   connect(TZonCooSetOcc.y, higThaCooSet.u2) annotation (Line(points={{-78,20},{-40,
           20},{-40,22},{-2,22}}, color={0,0,127}));
   connect(TZonHeaSetUno.y, greEqu2.u1)
     annotation (Line(points={{-78,-30},{-2,-30}},   color={0,0,127}));
-  connect(zonTem.y, greEqu2.u2) annotation (Line(points={{-38,50},{-20,50},{-20,
+  connect(zonTem.y, greEqu2.u2) annotation (Line(points={{-28,50},{-20,50},{-20,
           -38},{-2,-38}}, color={0,0,127}));
   connect(greEqu2.y, booToInt.u)
     annotation (Line(points={{22,-30},{38,-30}},   color={255,0,255}));
   connect(booToInt.y, opeModSel.totColZon) annotation (Line(points={{62,-30},{76,
           -30},{76,100},{118,100}}, color={255,127,0}));
-  connect(zonTem.y, opeModSel.TZonMax) annotation (Line(points={{-38,50},{58,50},
+  connect(zonTem.y, opeModSel.TZonMax) annotation (Line(points={{-28,50},{58,50},
           {58,94},{118,94}}, color={0,0,127}));
-  connect(zonTem.y, opeModSel.TZonMin) annotation (Line(points={{-38,50},{64,50},
+  connect(zonTem.y, opeModSel.TZonMin) annotation (Line(points={{-28,50},{64,50},
           {64,92},{118,92}}, color={0,0,127}));
-  connect(zonTem.y, greEqu3.u1) annotation (Line(points={{-38,50},{-20,50},{-20,
+  connect(zonTem.y, greEqu3.u1) annotation (Line(points={{-28,50},{-20,50},{-20,
           -100},{-2,-100}}, color={0,0,127}));
   connect(TZonCooSetUno.y, greEqu3.u2) annotation (Line(points={{-78,-100},{-40,
           -100},{-40,-108},{-2,-108}}, color={0,0,127}));
@@ -125,7 +125,7 @@ equation
           {30,-10},{70,-10},{70,98},{118,98}}, color={255,0,255}));
   connect(greEqu3.y, opeModSel.uSetUp) annotation (Line(points={{22,-100},{30,-100},
           {30,-80},{94,-80},{94,88},{118,88}}, color={255,0,255}));
-  connect(zonTem.y, sub3.u1) annotation (Line(points={{-38,50},{-20,50},{-20,-54},
+  connect(zonTem.y, sub3.u1) annotation (Line(points={{-28,50},{-20,50},{-20,-54},
           {-2,-54}}, color={0,0,127}));
   connect(TZonHeaSetUno.y, sub3.u2) annotation (Line(points={{-78,-30},{-40,-30},
           {-40,-66},{-2,-66}}, color={0,0,127}));
@@ -137,11 +137,19 @@ equation
     annotation (Line(points={{22,-140},{38,-140}}, color={0,0,127}));
   connect(hys1.y, opeModSel.uEndSetUp) annotation (Line(points={{62,-140},{100,-140},
           {100,86},{118,86}}, color={255,0,255}));
-
+  connect(zonTem.y, sub1.u2) annotation (Line(points={{-28,50},{-20,50},{-20,-146},
+          {-2,-146}}, color={0,0,127}));
+  connect(TZonCooSetUno.y, sub1.u1) annotation (Line(points={{-78,-100},{-40,-100},
+          {-40,-134},{-2,-134}}, color={0,0,127}));
+  connect(sin1.y, gai.u)
+    annotation (Line(points={{-88,50},{-82,50}}, color={0,0,127}));
+  connect(gai.y, zonTem.u)
+    annotation (Line(points={{-58,50},{-52,50}}, color={0,0,127}));
   connect(zonTem.y, sub1.u2) annotation (Line(points={{-38,50},{-20,50},{-20,-146},
           {-2,-146}}, color={0,0,127}));
   connect(TZonCooSetUno.y, sub1.u1) annotation (Line(points={{-78,-100},{-40,-100},
           {-40,-134},{-2,-134}}, color={0,0,127}));
+
 annotation (
   experiment(StopTime=172800, Tolerance=1e-06),
   __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/OperationMode.mos"
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/ZoneStatus.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/ZoneStatus.mo
index ad939a829e2..74cc38a40e9 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/ZoneStatus.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/ZoneStatus.mo
@@ -29,12 +29,15 @@ model ZoneStatus
     annotation (Placement(transformation(extent={{-100,-50},{-80,-30}})));
   Buildings.Controls.OBC.CDL.Continuous.Sin sin2
     "Block that outputs the sine of the input"
-    annotation (Placement(transformation(extent={{-60,-50},{-40,-30}})));
+    annotation (Placement(transformation(extent={{-70,-50},{-50,-30}})));
+  Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai(
+    final k=12.5)
+    "Gain factor"
+    annotation (Placement(transformation(extent={{-40,-50},{-20,-30}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter zonTem(
-    final k=12.5,
     final p=273.15 + 22.5)
     "Current zone temperature"
-    annotation (Placement(transformation(extent={{-20,-50},{0,-30}})));
+    annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
 
 equation
   connect(cooDowTim.y, noWinZonSta.cooDowTim) annotation (Line(points={{-58,60},
@@ -42,19 +45,21 @@ equation
   connect(warUpTim.y, noWinZonSta.warUpTim) annotation (Line(points={{-58,20},{-14,
           20},{-14,78},{58,78}}, color={0,0,127}));
   connect(ramp2.y,sin2. u)
-    annotation (Line(points={{-78,-40},{-62,-40}}, color={0,0,127}));
-  connect(sin2.y, zonTem.u)
-    annotation (Line(points={{-38,-40},{-22,-40}},color={0,0,127}));
-  connect(zonTem.y, noWinZonSta.TZon) annotation (Line(points={{2,-40},{20,-40},
+    annotation (Line(points={{-78,-40},{-72,-40}}, color={0,0,127}));
+  connect(zonTem.y, noWinZonSta.TZon) annotation (Line(points={{12,-40},{20,-40},
           {20,66},{58,66}},    color={0,0,127}));
   connect(cooDowTim.y, witWinZonSta.cooDowTim) annotation (Line(points={{-58,60},
           {-20,60},{-20,2},{58,2}},    color={0,0,127}));
   connect(warUpTim.y, witWinZonSta.warUpTim) annotation (Line(points={{-58,20},{
           -14,20},{-14,-2},{58,-2}},    color={0,0,127}));
-  connect(zonTem.y, witWinZonSta.TZon) annotation (Line(points={{2,-40},{20,-40},
+  connect(zonTem.y, witWinZonSta.TZon) annotation (Line(points={{12,-40},{20,-40},
           {20,-14},{58,-14}},color={0,0,127}));
   connect(uWinSta.y, witWinZonSta.uWin) annotation (Line(points={{2,-80},{40,-80},
           {40,-10},{58,-10}}, color={255,0,255}));
+  connect(sin2.y, gai.u)
+    annotation (Line(points={{-48,-40},{-42,-40}}, color={0,0,127}));
+  connect(gai.y, zonTem.u)
+    annotation (Line(points={{-18,-40},{-12,-40}}, color={0,0,127}));
 
 annotation (
   experiment(StopTime=86400, Tolerance=1e-6),
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo
index 8957d742546..588eb23cf12 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo
@@ -272,12 +272,10 @@ protected
     final k=0.5) "Constant real value"
     annotation (Placement(transformation(extent={{-260,-340},{-240,-320}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar(
-    final p=dTDisZonSetMax,
-    final k=1)
+    final p=dTDisZonSetMax)
     "Maximum heating discharge temperature"
     annotation (Placement(transformation(extent={{-260,-70},{-240,-50}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1(
-    final k=1,
     final p=2.8)
     "Zone temperature pluTZonSets 2.8 degC"
     annotation (Placement(transformation(extent={{-260,-260},{-240,-240}})));
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SystemRequests.mo
index 584b77627bf..f57fee6dcb0 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SystemRequests.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SystemRequests.mo
@@ -233,12 +233,10 @@ protected
     "Calculate difference of discharge temperature (plus errTDis_2) and its setpoint"
     annotation (Placement(transformation(extent={{-80,-310},{-60,-290}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar(
-    final k=1,
     final p=errTDis_1) if have_heaWatCoi
     "Discharge temperature plus errTDis_1"
     annotation (Placement(transformation(extent={{-140,-272},{-120,-252}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1(
-    final k=1,
     final p=errTDis_2) if have_heaWatCoi
     "Discharge temperature plus errTDis_2"
     annotation (Placement(transformation(extent={{-140,-330},{-120,-310}})));
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo
index fb30746b229..8091ccfb74a 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo
@@ -175,18 +175,15 @@ block ZoneTemperatures
   Buildings.Controls.OBC.CDL.Logical.Not not1 "Logic not"
     annotation (Placement(transformation(extent={{0,140},{20,160}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar3(
-    final p=incTSetDem_3,
-    final k=1)
+    final p=incTSetDem_3)
     "Increase setpoint by 2.2 degC"
     annotation (Placement(transformation(extent={{40,20},{60,40}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1(
-    final p=incTSetDem_2,
-    final k=1)
+    final p=incTSetDem_2)
     "Increase setpoint by 1.1 degC"
     annotation (Placement(transformation(extent={{40,60},{60,80}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar2(
-    final p=incTSetDem_1,
-    final k=1)
+    final p=incTSetDem_1)
     "Increase setpoint by 0.56 degC"
     annotation (Placement(transformation(extent={{40,100},{60,120}})));
   Buildings.Controls.OBC.CDL.Continuous.Multiply pro6
@@ -212,17 +209,14 @@ block ZoneTemperatures
     "Output product of the two inputs"
     annotation (Placement(transformation(extent={{80,-80},{100,-60}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar6(
-    final k=1,
     final p=-decTSetDem_1)
     "Decrease setpoint by 0.56 degC"
     annotation (Placement(transformation(extent={{40,-120},{60,-100}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar5(
-    final k=1,
     final p=-decTSetDem_2)
     "Decrease setpoint by 1.1 degC"
     annotation (Placement(transformation(extent={{40,-160},{60,-140}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar4(
-    final k=1,
     final p=-decTSetDem_3)
     "Decrease setpoint by 2.2 degC"
     annotation (Placement(transformation(extent={{40,-200},{60,-180}})));
@@ -245,13 +239,11 @@ block ZoneTemperatures
     "Instant when the zone becomes more than 5 minutes"
     annotation (Placement(transformation(extent={{-40,-280},{-20,-260}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter heaSetDec(
-    p=-1.1,
-    final k=1)
+    final p=-1.1)
     "Heating setpoint decrease due to the 5 minutes unpopulation under occupied mode"
     annotation (Placement(transformation(extent={{100,-320},{120,-300}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter cooSetInc(
-    p=1.1,
-    final k=1)
+    final p=1.1)
     "Heating setpoint increase due to the 5 minutes unpopulation under occupied mode"
     annotation (Placement(transformation(extent={{100,-280},{120,-260}})));
   Buildings.Controls.OBC.CDL.Discrete.TriggeredSampler cooSetSam
@@ -275,8 +267,7 @@ block ZoneTemperatures
     "Limit occupied zone heating setpoint"
     annotation (Placement(transformation(extent={{-240,-590},{-220,-570}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar(
-    p=-0.56,
-    final k=1)
+    final p=-0.56)
     "Cooling setpoint minus 0.56 degC"
     annotation (Placement(transformation(extent={{160,-590},{180,-570}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Add.mo b/Buildings/Controls/OBC/CDL/Continuous/Add.mo
index f07103f1d0a..89e21032f5a 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Add.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/Add.mo
@@ -22,7 +22,7 @@ Block that outputs <code>y</code> as the sum of the
 two input signals <code>u1</code> and <code>u2</code>,
 </p>
 <pre>
-    y = u1 + u2
+    y = u1 + u2.
 </pre>
 </html>",
 revisions="<html>
diff --git a/Buildings/Controls/OBC/CDL/Continuous/AddParameter.mo b/Buildings/Controls/OBC/CDL/Continuous/AddParameter.mo
index d81abb4d59a..0ad84aba366 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/AddParameter.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/AddParameter.mo
@@ -3,30 +3,30 @@ block AddParameter
   "Output the sum of an input plus a parameter"
   parameter Real p
     "Value to be added";
-  parameter Real k
-    "Gain of input";
-  Interfaces.RealInput u
-    "Connector of Real input signal"
+  Interfaces.RealInput u "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
-    "Connector of Real output signal"
+  Interfaces.RealOutput y "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 equation
-  y=k*u+p;
+  y=u+p;
   annotation (
     defaultComponentName="addPar",
     Documentation(
       info="<html>
 <p>
-Block that outputs <code>y = k u + p</code>,
-where <code>k</code> and <code>p</code> are
-parameters and <code>u</code> is an input.
+Block that outputs <code>y = u + p</code>,
+where <code>p</code> is parameter and <code>u</code> is an input.
 </p>
 </html>",
-      revisions="<html>
+revisions="<html>
 <ul>
 <li>
+February 3, 2022, by Jianjun Hu:<br/>
+Removed input gain factor.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2876\">issue 2876</a>.
+</li>
+<li>
 March 2, 2020, by Michael Wetter:<br/>
 Changed icon to display dynamically the output value.
 </li>
@@ -61,22 +61,13 @@ Modelica Standard Library.
           extent={{-122,58},{-17,98}},
           textString="%p",
           textColor={0,0,0}),
-        Polygon(
-          points={{-86,-36},{-86,36},{-34,0},{-86,-36}},
-          lineColor={0,0,127},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Text(
-          extent={{-196,-84},{104,-44}},
-          textColor={0,0,0},
-          textString="k=%k"),
         Ellipse(
           lineColor={0,0,127},
           extent={{-12,-52},{88,48}},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid),
         Text(
-          extent={{-2,-22},{74,46}},
+          extent={{0,-26},{76,42}},
           textString="+"),
         Text(
           extent={{226,60},{106,10}},
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/AddParameter.mo b/Buildings/Controls/OBC/CDL/Continuous/Validation/AddParameter.mo
index 13fff553de6..bdade25e3c4 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/AddParameter.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/Validation/AddParameter.mo
@@ -2,8 +2,7 @@ within Buildings.Controls.OBC.CDL.Continuous.Validation;
 model AddParameter
   "Validation model for the AddParameter block"
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar(
-    p=0.5,
-    k=1.0)
+    p=0.5)
     "Block that outputs the sum of an input plus a parameter"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1(
diff --git a/Buildings/Controls/OBC/CDL/Integers/Add.mo b/Buildings/Controls/OBC/CDL/Integers/Add.mo
index 040f4c81b59..812d671f352 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Add.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Add.mo
@@ -21,7 +21,7 @@ Block that outputs <code>y</code> as the sum of the
 two Integer input signals <code>u1</code> and <code>u2</code>,
 </p>
 <pre>
-    y = u1 + u2
+    y = u1 + u2.
 </pre>
 </html>",
 revisions="<html>
diff --git a/Buildings/Controls/OBC/CDL/Integers/AddParameter.mo b/Buildings/Controls/OBC/CDL/Integers/AddParameter.mo
new file mode 100644
index 00000000000..b6ff918f857
--- /dev/null
+++ b/Buildings/Controls/OBC/CDL/Integers/AddParameter.mo
@@ -0,0 +1,65 @@
+within Buildings.Controls.OBC.CDL.Integers;
+block AddParameter "Output the sum of an input plus a parameter"
+  parameter Integer p
+    "Value to be added";
+  Interfaces.IntegerInput u "Connector of Integer input signal"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
+  Interfaces.IntegerOutput y "Connector of Integer output signal"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
+
+equation
+  y=u+p;
+  annotation (
+    defaultComponentName="addPar",
+    Documentation(
+      info="<html>
+<p>
+Block that outputs <code>y = u + p</code>,
+where <code>p</code> is parameter and <code>u</code> is an input.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+February 3 2022, by Jianjun Hu:<br/>
+First implementation.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2876\">issue 2876</a>.
+</li>
+</ul>
+</html>"),
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={255,127,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          textColor={0,0,255},
+          extent={{-150,110},{150,150}},
+          textString="%name"),
+        Line(points={{-54,66},{-28,30},{2,30}}, color={255,127,0}),
+        Line(points={{-100,0},{100,0}}, color={255,127,0}),
+        Text(
+          extent={{-122,58},{-17,98}},
+          textColor={255,127,0},
+          textString="%p"),
+        Ellipse(
+          lineColor={255,127,0},
+          extent={{-12,-52},{88,48}},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{0,-26},{76,42}},
+          textString="+",
+          textColor={255,127,0}),
+        Text(
+          extent={{226,60},{106,10}},
+          textColor={0,0,0},
+          textString=DynamicSelect("",String(y,
+            leftJustified=false,
+            significantDigits=3)))}));
+end AddParameter;
diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/AddParameter.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/AddParameter.mo
new file mode 100644
index 00000000000..aadc5c5d529
--- /dev/null
+++ b/Buildings/Controls/OBC/CDL/Integers/Validation/AddParameter.mo
@@ -0,0 +1,63 @@
+within Buildings.Controls.OBC.CDL.Integers.Validation;
+model AddParameter "Validation model for the AddParameter block"
+  Buildings.Controls.OBC.CDL.Integers.AddParameter addPar(p=5)
+    "Block that outputs the sum of an input plus a parameter"
+    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1(
+    duration=1,
+    offset=-3.5,
+    height=7.0)
+    "Block that generates ramp signal"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Round round1(n=0)
+    "Round real number to given digits"
+    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+  Buildings.Controls.OBC.CDL.Conversions.RealToInteger  reaToInt
+    "Convert real to integer"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+
+equation
+  connect(ramp1.y,round1.u)
+    annotation (Line(points={{-58,0},{-42,0}},  color={0,0,127}));
+  connect(round1.y,reaToInt.u)
+    annotation (Line(points={{-18,0},{-2,0}},  color={0,0,127}));
+  connect(reaToInt.y, addPar.u)
+    annotation (Line(points={{22,0},{38,0}}, color={255,127,0}));
+
+annotation (
+    experiment(
+      StopTime=1.0,
+      Tolerance=1e-06),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/AddParameter.mos" "Simulate and plot"),
+    Documentation(
+      info="<html>
+<p>
+Validation test for the block
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Integers.AddParameter\">
+Buildings.Controls.OBC.CDL.Integers.AddParameter</a>.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+February 3, 2022, by Jianjun Hu:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}));
+end AddParameter;
diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/package.order b/Buildings/Controls/OBC/CDL/Integers/Validation/package.order
index 94aeff453bb..42f8664efd2 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Validation/package.order
+++ b/Buildings/Controls/OBC/CDL/Integers/Validation/package.order
@@ -1,5 +1,6 @@
 Abs
 Add
+AddParameter
 Change
 Equal
 Greater
diff --git a/Buildings/Controls/OBC/CDL/Integers/package.order b/Buildings/Controls/OBC/CDL/Integers/package.order
index 94f16bf2e14..6e3470c3d21 100644
--- a/Buildings/Controls/OBC/CDL/Integers/package.order
+++ b/Buildings/Controls/OBC/CDL/Integers/package.order
@@ -1,5 +1,6 @@
 Abs
 Add
+AddParameter
 Change
 Equal
 Greater
diff --git a/Buildings/Controls/OBC/UnitConversions/From_degC.mo b/Buildings/Controls/OBC/UnitConversions/From_degC.mo
index 4bf6b14dc96..beb3ec33d3f 100644
--- a/Buildings/Controls/OBC/UnitConversions/From_degC.mo
+++ b/Buildings/Controls/OBC/UnitConversions/From_degC.mo
@@ -17,16 +17,22 @@ protected
   constant Real k = 1. "Multiplier";
   constant Real p = 273.15 "Adder";
 
+  Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai(
+    final k = k) "Gain factor"
+    annotation (Placement(transformation(extent={{-68,-10},{-48,10}})));
+
   Buildings.Controls.OBC.CDL.Continuous.AddParameter conv(
-    final p = p,
-    final k = k) "Unit converter"
+    final p = p) "Unit converter"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
 
 equation
-  connect(u, conv.u)
-    annotation (Line(points={{-120,0},{-12,0}},color={0,0,127}));
   connect(conv.y, y)
-    annotation (Line(points={{12,0},{120,0}},color={0,0,127}));
+    annotation (Line(points={{12,0},{60,0},{60,0},{120,0}},color={0,0,127}));
+  connect(u, gai.u)
+    annotation (Line(points={{-120,0},{-70,0}}, color={0,0,127}));
+  connect(gai.y, conv.u)
+    annotation (Line(points={{-46,0},{-12,0}}, color={0,0,127}));
+
   annotation (
       defaultComponentName = "from_degC",
     Icon(graphics={
diff --git a/Buildings/Controls/OBC/UnitConversions/From_degF.mo b/Buildings/Controls/OBC/UnitConversions/From_degF.mo
index b1c07c2e29a..b421a60b6ba 100644
--- a/Buildings/Controls/OBC/UnitConversions/From_degF.mo
+++ b/Buildings/Controls/OBC/UnitConversions/From_degF.mo
@@ -17,16 +17,22 @@ protected
   constant Real k = 5./9. "Multiplier";
   constant Real p = -32. * (5./9.) + 273.15 "Adder";
 
+  Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai(
+    final k = k) "Gain factor"
+    annotation (Placement(transformation(extent={{-68,-10},{-48,10}})));
+
   Buildings.Controls.OBC.CDL.Continuous.AddParameter conv(
-    final p = p,
-    final k = k) "Unit converter"
+    final p = p) "Unit converter"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
 
 equation
-  connect(u, conv.u)
-    annotation (Line(points={{-120,0},{-12,0}},color={0,0,127}));
   connect(conv.y, y)
-    annotation (Line(points={{12,0},{120,0}},color={0,0,127}));
+    annotation (Line(points={{12,0},{60,0},{60,0},{120,0}},color={0,0,127}));
+  connect(u, gai.u)
+    annotation (Line(points={{-120,0},{-70,0}}, color={0,0,127}));
+  connect(gai.y, conv.u)
+    annotation (Line(points={{-46,0},{-12,0}}, color={0,0,127}));
+
   annotation (
       defaultComponentName = "from_degF",
     Icon(graphics={
diff --git a/Buildings/Controls/OBC/UnitConversions/To_degC.mo b/Buildings/Controls/OBC/UnitConversions/To_degC.mo
index 32b1a5df1fd..2184e7f6270 100644
--- a/Buildings/Controls/OBC/UnitConversions/To_degC.mo
+++ b/Buildings/Controls/OBC/UnitConversions/To_degC.mo
@@ -17,16 +17,22 @@ protected
   constant Real k = 1. "Multiplier";
   constant Real p = -273.15 "Adder";
 
+  Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai(
+    final k = k) "Gain factor"
+    annotation (Placement(transformation(extent={{-68,-10},{-48,10}})));
+
   Buildings.Controls.OBC.CDL.Continuous.AddParameter conv(
-    final p = p,
-    final k = k) "Unit converter"
+    final p = p) "Unit converter"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
 
 equation
-  connect(u, conv.u)
-    annotation (Line(points={{-120,0},{-12,0}},color={0,0,127}));
   connect(conv.y, y)
-    annotation (Line(points={{12,0},{120,0}},color={0,0,127}));
+    annotation (Line(points={{12,0},{60,0},{60,0},{120,0}},color={0,0,127}));
+  connect(u, gai.u)
+    annotation (Line(points={{-120,0},{-70,0}}, color={0,0,127}));
+  connect(gai.y, conv.u)
+    annotation (Line(points={{-46,0},{-12,0}}, color={0,0,127}));
+
   annotation (
       defaultComponentName = "to_degC",
     Icon(graphics={
diff --git a/Buildings/Controls/OBC/UnitConversions/To_degF.mo b/Buildings/Controls/OBC/UnitConversions/To_degF.mo
index 3ec40c7b03b..443fc6da798 100644
--- a/Buildings/Controls/OBC/UnitConversions/To_degF.mo
+++ b/Buildings/Controls/OBC/UnitConversions/To_degF.mo
@@ -17,16 +17,22 @@ protected
   constant Real k = 9./5. "Multiplier";
   constant Real p = (-9./5.) * 273.15 + 32 "Adder";
 
+  Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai(
+    final k = k) "Gain factor"
+    annotation (Placement(transformation(extent={{-68,-10},{-48,10}})));
+
   Buildings.Controls.OBC.CDL.Continuous.AddParameter conv(
-    final p = p,
-    final k = k) "Unit converter"
+    final p = p) "Unit converter"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
 
 equation
-  connect(u, conv.u)
-    annotation (Line(points={{-120,0},{-12,0}},color={0,0,127}));
   connect(conv.y, y)
-    annotation (Line(points={{12,0},{120,0}},color={0,0,127}));
+    annotation (Line(points={{12,0},{60,0},{60,0},{120,0}},color={0,0,127}));
+  connect(u, gai.u)
+    annotation (Line(points={{-120,0},{-70,0}}, color={0,0,127}));
+  connect(gai.y, conv.u)
+    annotation (Line(points={{-46,0},{-12,0}}, color={0,0,127}));
+
   annotation (
       defaultComponentName = "to_degF",
     Icon(graphics={
diff --git a/Buildings/Controls/OBC/Utilities/OptimalStart.mo b/Buildings/Controls/OBC/Utilities/OptimalStart.mo
index 8f8599919e5..45003994452 100644
--- a/Buildings/Controls/OBC/Utilities/OptimalStart.mo
+++ b/Buildings/Controls/OBC/Utilities/OptimalStart.mo
@@ -103,8 +103,7 @@ protected
     "Get the maximum optimal start time "
     annotation (Placement(transformation(extent={{100,30},{120,50}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar(
-    p=-tOptMax,
-    k=1)
+    p=-tOptMax)
     "Maximum optimal start time"
     annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));
   Buildings.Controls.OBC.CDL.Logical.Or or2
diff --git a/Buildings/Examples/VAVReheat/BaseClasses/Controls/Economizer.mo b/Buildings/Examples/VAVReheat/BaseClasses/Controls/Economizer.mo
index ef469e48c20..b9218917ebc 100644
--- a/Buildings/Examples/VAVReheat/BaseClasses/Controls/Economizer.mo
+++ b/Buildings/Examples/VAVReheat/BaseClasses/Controls/Economizer.mo
@@ -47,9 +47,9 @@ block Economizer "Controller for economizer"
           extent={{200,-20},{240,20}}),
           iconTransformation(extent={{200,-20},{240, 20}})));
   Modelica.Blocks.Interfaces.RealOutput yOA
-    "Control signal for outside air damper" annotation (Placement(
-        transformation(extent={{200,60},{240,100}}),iconTransformation(extent={{200,60},
-            {240,100}})));
+    "Control signal for outside air damper"
+    annotation (Placement(transformation(extent={{200,-80},{240,-40}}),
+        iconTransformation(extent={{200,60},{240,100}})));
   Modelica.Blocks.Math.Gain gain(k=1/VOut_flow_min) "Normalize mass flow rate"
     annotation (Placement(transformation(extent={{-60,-70},{-40,-50}})));
   Buildings.Controls.OBC.CDL.Continuous.PID conV_flow(
@@ -81,7 +81,7 @@ block Economizer "Controller for economizer"
   Modelica.Blocks.Sources.Constant TFre(k=TFreSet)
     "Setpoint for freeze protection"
     annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
-  Buildings.Controls.OBC.CDL.Continuous.AddParameter invSig(p=1, k=-1)
+  Buildings.Controls.OBC.CDL.Continuous.Subtract invSig
     "Invert control signal for interlocked damper"
     annotation (Placement(transformation(extent={{170,-10},{190,10}})));
   Modelica.Blocks.Logical.Hysteresis hysLoc(final uLow=0, final uHigh=dTLock)
@@ -101,6 +101,10 @@ block Economizer "Controller for economizer"
   Buildings.Controls.OBC.CDL.Continuous.Max maxOutDam
     "Select larger of the outdoor damper signals"
     annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne(
+    final k=1)
+    "Constant 1"
+    annotation (Placement(transformation(extent={{100,70},{120,90}})));
 equation
   connect(VOut_flow, gain.u) annotation (Line(
       points={{-120,-60},{-62,-60}},
@@ -115,7 +119,7 @@ equation
       color={0,0,127},
       smooth=Smooth.None));
   connect(yOATFre.y, minFrePro.u1)
-    annotation (Line(points={{-9,80},{0,80},{0,20},{78,20}}, color={0,0,127}));
+    annotation (Line(points={{-8,80},{0,80},{0,20},{78,20}}, color={0,0,127}));
   connect(yRet, invSig.y)
     annotation (Line(points={{220,0},{192,0}}, color={0,0,127}));
   connect(feedback.y, hysLoc.u)
@@ -136,30 +140,30 @@ equation
     annotation (Line(points={{-9,120},{88,120}}, color={255,0,255}));
   connect(uOATSup, swiOA.u1) annotation (Line(points={{-120,160},{60,160},{60,128},
           {88,128}}, color={0,0,127}));
-
   connect(one.y, minFrePro.u1)
     annotation (Line(points={{-39,20},{78,20}}, color={0,0,127}));
   connect(yOATFre.u_s, TFre.y)
     annotation (Line(points={{-32,80},{-39,80}}, color={0,0,127}));
   connect(TMix, yOATFre.u_m)
     annotation (Line(points={{-120,40},{-20,40},{-20,68}}, color={0,0,127}));
-  connect(swiModClo.y, invSig.u)
-    annotation (Line(points={{152,0},{168,0}}, color={0,0,127}));
-  connect(swiModClo.y, yOA) annotation (Line(points={{152,0},{160,0},{160,80},{220,
-          80}}, color={0,0,127}));
+  connect(swiModClo.y, yOA) annotation (Line(points={{152,0},{160,0},{160,-60},{
+          220,-60}}, color={0,0,127}));
   connect(uEna, swiModClo.u2) annotation (Line(points={{-120,190},{140,190},{
-          140,20},{124,20},{124,0},{128,0}},
-                                         color={255,0,255}));
+          140,20},{124,20},{124,0},{128,0}}, color={255,0,255}));
   connect(closed.y, swiModClo.u3) annotation (Line(points={{51,40},{120,40},{120,
           -8},{128,-8}}, color={0,0,127}));
   connect(maxOutDam.u1, swiOA.y) annotation (Line(points={{38,6},{20,6},{20,100},
           {120,100},{120,120},{112,120}}, color={0,0,127}));
-  connect(conV_flow.y, maxOutDam.u2) annotation (Line(points={{11,-20},{20,-20},
+  connect(conV_flow.y, maxOutDam.u2) annotation (Line(points={{12,-20},{20,-20},
           {20,-6},{38,-6}}, color={0,0,127}));
-  connect(minFrePro.y, swiModClo.u1) annotation (Line(points={{101,14},{114,14},
+  connect(minFrePro.y, swiModClo.u1) annotation (Line(points={{102,14},{114,14},
           {114,8},{128,8}}, color={0,0,127}));
   connect(maxOutDam.y, minFrePro.u2)
-    annotation (Line(points={{62,0},{72,0},{72,8},{80,8}}, color={0,0,127}));
+    annotation (Line(points={{62,0},{72,0},{72,8},{78,8}}, color={0,0,127}));
+  connect(swiModClo.y, invSig.u2) annotation (Line(points={{152,0},{160,0},{160,
+          -6},{168,-6}}, color={0,0,127}));
+  connect(conOne.y, invSig.u1) annotation (Line(points={{122,80},{160,80},{160,6},
+          {168,6}}, color={0,0,127}));
   annotation (defaultComponentName="conEco",
     Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{200,
             200}})),
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideCold.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideCold.mo
index d3d56b73ff3..20d92473ddf 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideCold.mo
+++ b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideCold.mo
@@ -14,10 +14,11 @@ model SideCold
   parameter Real k(
     min=0)=0.1
     "Gain of controller";
-  parameter Modelica.Units.SI.Time Ti(min=Buildings.Controls.OBC.CDL.Constants.small)=
-       120 "Time constant of integrator block" annotation (Dialog(enable=
-          controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
-           or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Modelica.Units.SI.Time Ti(
+    min=Buildings.Controls.OBC.CDL.Constants.small)=120
+    "Time constant of integrator block"
+    annotation (Dialog(enable=controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+                           or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uCol
     "Cold rejection control signal"
     annotation (Placement(transformation(extent={{-220,-20},{-180,20}}),
@@ -34,15 +35,15 @@ model SideCold
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant x1[nSouAmb](
     final k={(i-1) for i in 1:nSouAmb})
     "x1"
-    annotation (Placement(transformation(extent={{0,10},{20,30}})));
+    annotation (Placement(transformation(extent={{40,10},{60,30}})));
   Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep(
     final nout=nSouAmb)
     "Replicate control signal"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-20,0})));
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0)));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant f1[nSouAmb](
     each final k=0)
     "f1"
-    annotation (Placement(transformation(extent={{0,-30},{20,-10}})));
+    annotation (Placement(transformation(extent={{40,-40},{60,-20}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant f2[nSouAmb](
     each final k=1)
     "f2"
@@ -50,7 +51,7 @@ model SideCold
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant x2[nSouAmb](
     final k={(i) for i in 1:nSouAmb})
     "x2"
-    annotation (Placement(transformation(extent={{0,-70},{20,-50}})));
+    annotation (Placement(transformation(extent={{40,-70},{60,-50}})));
   Combined.Controls.PIDWithEnable conTChiWatSup(
     final k=k,
     final Ti=Ti,
@@ -59,7 +60,7 @@ model SideCold
     final yMax=1,
     final reverseActing=false)
     "Controller for CHWST"
-    annotation (Placement(transformation(extent={{-130,-30},{-110,-10}})));
+    annotation (Placement(transformation(extent={{-150,-30},{-130,-10}})));
   Buildings.Controls.OBC.CDL.Continuous.Line mapFunTChiSupSet
     "Mapping function for CHWST reset"
     annotation (Placement(transformation(extent={{100,70},{120,90}})));
@@ -70,9 +71,13 @@ model SideCold
     "Minimum value of chilled water supply temperature"
     annotation (Placement(transformation(extent={{62,50},{82,70}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar(
-    p=nSouAmb, k=-nSouAmb)
+    p=nSouAmb)
     "One minus control loop output"
-    annotation (Placement(transformation(extent={{-100,-30},{-80,-10}})));
+    annotation (Placement(transformation(extent={{-80,-30},{-60,-10}})));
+  Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai(
+    k=-nSouAmb)
+    "Gain factor"
+    annotation (Placement(transformation(extent={{-120,-30},{-100,-10}})));
   Buildings.Controls.OBC.CDL.Continuous.Max max1
     "CHWST reset signal"
     annotation (Placement(transformation(extent={{-30,70},{-10,90}})));
@@ -81,15 +86,14 @@ model SideCold
     "Zero"
     annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter subNumSou(
-    p=-nSouAmb,
-    k=1)
+    p=-nSouAmb)
     "Control signal minus nSouAmb"
     annotation (Placement(transformation(extent={{-80,90},{-60,110}})));
   Buildings.Controls.OBC.CDL.Continuous.Min min1
     "Ambient source control signal"
-    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimitSlewRate ramLimHea(raisingSlewRate
-      =0.1) "Limit the rate of change"
+    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.LimitSlewRate ramLimHea(
+    raisingSlewRate=0.1) "Limit the rate of change"
     annotation (Placement(transformation(extent={{140,70},{160,90}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uHeaCoo
     "Enable signal for heating or cooling"
@@ -129,44 +133,41 @@ model SideCold
     annotation (Placement(transformation(extent={{80,-110},{100,-90}})));
 equation
   connect(x1.y,mapFun.x1)
-    annotation (Line(points={{22,20},{36,20},{36,8},{98,8}},color={0,0,127}));
+    annotation (Line(points={{62,20},{80,20},{80,8},{98,8}},color={0,0,127}));
   connect(rep.y,mapFun.u)
-    annotation (Line(points={{-8,0},{98,0}},color={0,0,127}));
+    annotation (Line(points={{12,0},{98,0}},color={0,0,127}));
   connect(f1.y,mapFun.f1)
-    annotation (Line(points={{22,-20},{36,-20},{36,4},{98,4}},color={0,0,127}));
+    annotation (Line(points={{62,-30},{80,-30},{80,4},{98,4}},color={0,0,127}));
   connect(f2.y,mapFun.f2)
-    annotation (Line(points={{12,120},{40,120},{40,-8},{98,-8}},color={0,0,127}));
+    annotation (Line(points={{12,120},{30,120},{30,-8},{98,-8}},color={0,0,127}));
   connect(x2.y,mapFun.x2)
-    annotation (Line(points={{22,-60},{44,-60},{44,-4},{98,-4}},color={0,0,127}));
+    annotation (Line(points={{62,-60},{90,-60},{90,-4},{98,-4}},color={0,0,127}));
   connect(TSet,conTChiWatSup.u_s)
-    annotation (Line(points={{-200,40},{-148,40},{-148,-20},{-132,-20}},color={0,0,127}));
+    annotation (Line(points={{-200,40},{-172,40},{-172,-20},{-152,-20}},color={0,0,127}));
   connect(TBot,conTChiWatSup.u_m)
-    annotation (Line(points={{-200,-80},{-120,-80},{-120,-32}},color={0,0,127}));
+    annotation (Line(points={{-200,-80},{-140,-80},{-140,-32}},color={0,0,127}));
   connect(f2[1].y,mapFunTChiSupSet.x2)
-    annotation (Line(points={{12,120},{40,120},{40,76},{98,76}},color={0,0,127}));
+    annotation (Line(points={{12,120},{30,120},{30,76},{98,76}},color={0,0,127}));
   connect(minTChiWatSup.y,mapFunTChiSupSet.f2)
     annotation (Line(points={{84,60},{90,60},{90,72},{98,72}},color={0,0,127}));
   connect(TSet,mapFunTChiSupSet.f1)
     annotation (Line(points={{-200,40},{20,40},{20,84},{98,84}},color={0,0,127}));
-  connect(conTChiWatSup.y,addPar.u)
-    annotation (Line(points={{-108,-20},{-102,-20}},color={0,0,127}));
   connect(uCol,subNumSou.u)
     annotation (Line(points={{-200,0},{-160,0},{-160,100},{-82,100}},color={0,0,127}));
   connect(max1.y,mapFunTChiSupSet.u)
     annotation (Line(points={{-8,80},{98,80}},color={0,0,127}));
   connect(uCol,min1.u1)
-    annotation (Line(points={{-200,0},{-80,0},{-80,6},{-62,6}},color={0,0,127}));
+    annotation (Line(points={{-200,0},{-80,0},{-80,6},{-42,6}},color={0,0,127}));
   connect(addPar.y,min1.u2)
-    annotation (Line(points={{-78,-20},{-70,-20},{-70,-6},{-62,-6}},color={0,0,127}));
+    annotation (Line(points={{-58,-20},{-50,-20},{-50,-6},{-42,-6}},color={0,0,127}));
   connect(min1.y,rep.u)
-    annotation (Line(points={{-38,0},{-32,0}},color={0,0,127}));
+    annotation (Line(points={{-18,0},{-12,0}},color={0,0,127}));
   connect(mapFun.y,yAmb)
     annotation (Line(points={{122,0},{140,0},{140,40},{200,40}},color={0,0,127}));
   connect(ramLimHea.y,TChiWatSupSet)
     annotation (Line(points={{162,80},{200,80}},color={0,0,127}));
   connect(uHeaCoo,conTChiWatSup.uEna)
-    annotation (Line(points={{-200,120},{-140,120},{-140,-40},{-124,-40},{-124,
-          -32}},                                                                     color={255,0,255}));
+    annotation (Line(points={{-200,120},{-166,120},{-166,-40},{-144,-40},{-144,-32}},color={255,0,255}));
   connect(zer.y,mapFunTChiSupSet.x1)
     annotation (Line(points={{-58,60},{0,60},{0,88},{98,88}},color={0,0,127}));
   connect(uCol,greThr.u)
@@ -183,6 +184,10 @@ equation
     annotation (Line(points={{-58,60},{-40,60},{-40,74},{-32,74}},color={0,0,127}));
   connect(subNumSou.y,max1.u1)
     annotation (Line(points={{-58,100},{-40,100},{-40,86},{-32,86}},color={0,0,127}));
+  connect(conTChiWatSup.y, gai.u)
+    annotation (Line(points={{-128,-20},{-122,-20}}, color={0,0,127}));
+  connect(gai.y, addPar.u)
+    annotation (Line(points={{-98,-20},{-82,-20}}, color={0,0,127}));
   annotation (
     defaultComponentName="conCol",
     Documentation(
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideHot.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideHot.mo
index 571facafe6b..ded312aad8d 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideHot.mo
+++ b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideHot.mo
@@ -16,8 +16,8 @@ block SideHot
   parameter Real k(
     min=0)=0.1
     "Gain of controller";
-  parameter Modelica.Units.SI.Time Ti(min=Buildings.Controls.OBC.CDL.Constants.small)
-     = 120 "Time constant of integrator block" annotation (Dialog(enable=
+  parameter Modelica.Units.SI.Time Ti(min=Buildings.Controls.OBC.CDL.Constants.small)=
+       120 "Time constant of integrator block" annotation (Dialog(enable=
           controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
            or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
   PIDWithEnable conColRej(
@@ -123,16 +123,14 @@ block SideHot
     nin=3)
     annotation (Placement(transformation(extent={{-40,-90},{-20,-70}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addDea(
-    p=dTDea,
-    k=1)
+    p=dTDea)
     "Add dead band"
     annotation (Placement(transformation(extent={{-130,-10},{-110,10}})));
   Modelica.Blocks.Discrete.ZeroOrderHold zeroOrderHold(
     samplePeriod=60)
     annotation (Placement(transformation(extent={{120,-10},{140,10}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addLoc(
-    p=dTLoc,
-    k=1)
+    p=dTLoc)
     "Add temperature difference for lockout"
     annotation (Placement(transformation(extent={{-130,30},{-110,50}})));
   Buildings.Controls.OBC.CDL.Continuous.Less isBelLoc(
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/WatersideEconomizer.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/WatersideEconomizer.mo
index cd45862f250..46c010ca695 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/WatersideEconomizer.mo
+++ b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/WatersideEconomizer.mo
@@ -51,8 +51,7 @@ model WatersideEconomizer
     annotation (Placement(transformation(extent={{180,-60},{220,-20}}),
       iconTransformation(extent={{100,-70},{140,-30}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addDelTem(
-    final p=dTEna,
-    final k=1)
+    final p=dTEna)
     "Add threshold for enabling WSE"
     annotation (Placement(transformation(extent={{-90,-50},{-70,-30}})));
   Modelica.StateGraph.InitialStepWithSignal iniSta(nIn=1, nOut=1)
@@ -154,11 +153,9 @@ equation
     annotation (Line(points={{-200,-40},{-160,-40},{-160,-45},{-142,-45}},
                                                                      color={0,0,127}));
   connect(calTemLvg.T2WatLvg, addDelTem.u) annotation (Line(points={{-118,-40},{-92,-40}}, color={0,0,127}));
-  connect(addDelTem.y, delTemDis1.u1) annotation (Line(points={{-68,-40},{-52,-40}},
-                                                                                  color={0,0,127}));
+  connect(addDelTem.y, delTemDis1.u1) annotation (Line(points={{-68,-40},{-52,-40}}, color={0,0,127}));
   connect(T2WatEnt, delTemDis1.u2)
-    annotation (Line(points={{-200,-80},{-60,-80},{-60,-48},{-52,-48}},
-                                                                      color={0,0,127}));
+    annotation (Line(points={{-200,-80},{-60,-80},{-60,-48},{-52,-48}}, color={0,0,127}));
   connect(iniSta.outPort[1], ena.inPort) annotation (Line(points={{-9.5,40},{16,40}},   color={0,0,0}));
   connect(ena.outPort, actSta.inPort[1]) annotation (Line(points={{21.5,40},{49,40}}, color={0,0,0}));
   connect(actSta.outPort[1], dis.inPort) annotation (Line(points={{70.5,40},{96,40}}, color={0,0,0}));
@@ -176,9 +173,9 @@ equation
   connect(iniSta.active, tim1.u) annotation (Line(points={{-20,29},{-20,20},{
           2.22045e-15,20},{2.22045e-15,12}},                                  color={255,0,255}));
   connect(tim1.passed, mulAnd.u[2])
-    annotation (Line(points={{-8,-12},{-8,-36},{-2,-36},{-2,-40.875}}, color={255,0,255}));
+    annotation (Line(points={{-8,-12},{-8,-36},{-2,-36},{-2,-38.25}},  color={255,0,255}));
   connect(uCoo, mulAnd.u[3]) annotation (Line(points={{-200,160},{-170,160},{-170,
-          0},{-20,0},{-20,-38},{-2,-38},{-2,-39.125}},
+          0},{-20,0},{-20,-38},{-2,-38},{-2,-41.75}},
                           color={255,0,255}));
   connect(actSta.active, tim.u) annotation (Line(points={{60,29},{60,-40},{50,-40},{50,-58}},
                                                                             color={255,0,255}));
@@ -191,13 +188,13 @@ equation
     annotation (Line(points={{-200,-160},{-142,-160}},color={0,0,127}));
   connect(isValIsoEvaClo.y, mulAnd.u[4])
     annotation (Line(points={{-118,-160},{-100,-160},{-100,-20},{-24,-20},{-24,-42},
-          {-2,-42},{-2,-37.375}},                                               color={255,0,255}));
+          {-2,-42},{-2,-45.25}}, color={255,0,255}));
   connect(isValIsoEvaClo.y, not1.u)
     annotation (Line(points={{-118,-160},{-60,-160},{-60,-140},{-52,-140}}, color={255,0,255}));
   connect(delTemDis.y, or1.u[1])
     annotation (Line(points={{-28,-100},{-2,-100},{-2,-102.333}},                 color={255,0,255}));
   connect(not2.y, or1.u[2]) annotation (Line(points={{-28,-70},{-20,-70},{-20,
-          -96},{-2,-96},{-2,-100}},                                                             color={255,0,255}));
+          -96},{-2,-96},{-2,-100}}, color={255,0,255}));
   connect(not1.y, or1.u[3])
     annotation (Line(points={{-28,-140},{-20,-140},{-20,-104},{-2,-104},{-2,
           -97.6667}},                                                             color={255,0,255}));
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/Building.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/Building.mo
index 7797dce4872..5c0877b0d60 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/Building.mo
+++ b/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/Building.mo
@@ -40,12 +40,12 @@ model Building
     annotation (Placement(transformation(extent={{-10,-270},{10,-250}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant one(k=1) "One"
     annotation (Placement(transformation(extent={{-80,-170},{-60,-150}})));
-  Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar(
-    p=0, k=-1)  if have_heaWat
+  Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai(
+    k=-1)  if have_heaWat
     "Opposite"
     annotation (Placement(transformation(extent={{30,-50},{50,-30}})));
-  Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1(
-    p=0, k=-1)  if have_chiWat
+  Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1(
+    k=-1)  if have_chiWat
     "Opposite"
     annotation (Placement(transformation(extent={{30,-250},{50,-230}})));
 equation
@@ -65,13 +65,13 @@ equation
           {260,-260},{260,-260}}, color={0,127,255}));
   connect(mulChiWatInl[1].port_b, loaCoo.port_a) annotation (Line(points={{-260,
           -260},{-136,-260},{-136,-260},{-10,-260}}, color={0,127,255}));
-  connect(loaHea.Q_flow, addPar.u) annotation (Line(points={{11,-54},{20,-54},{20,
+  connect(loaHea.Q_flow, gai.u) annotation (Line(points={{11,-54},{20,-54},{20,
           -40},{28,-40}}, color={0,0,127}));
-  connect(loaCoo.Q_flow, addPar1.u) annotation (Line(points={{11,-254},{20,-254},
+  connect(loaCoo.Q_flow, gai1.u) annotation (Line(points={{11,-254},{20,-254},
           {20,-240},{28,-240}}, color={0,0,127}));
-  connect(addPar.y, mulQHea_flow.u) annotation (Line(points={{52,-40},{80,-40},{
+  connect(gai.y, mulQHea_flow.u) annotation (Line(points={{52,-40},{80,-40},{
           80,280},{268,280}}, color={0,0,127}));
-  connect(addPar1.y, mulQCoo_flow.u) annotation (Line(points={{52,-240},{100,-240},
+  connect(gai1.y, mulQCoo_flow.u) annotation (Line(points={{52,-240},{100,-240},
           {100,240},{268,240}}, color={0,0,127}));
   connect(one.y, loaHea.u) annotation (Line(points={{-58,-160},{-40,-160},{-40,
           -54},{-12,-54}}, color={0,0,127}));
diff --git a/Buildings/Experimental/DHC/Networks/Controls.mo b/Buildings/Experimental/DHC/Networks/Controls.mo
index 4c3e5e01e1b..3858e41d915 100644
--- a/Buildings/Experimental/DHC/Networks/Controls.mo
+++ b/Buildings/Experimental/DHC/Networks/Controls.mo
@@ -96,7 +96,6 @@ package Controls "Package of control blocks for distribution systems"
       annotation (Placement(transformation(extent={{60,-150},{80,-130}})));
     Buildings.Controls.OBC.CDL.Continuous.AddParameter TMax_lower(
       final p=-dTSlo,
-      final k=1,
       y(final unit="K", displayUnit="degC"))
       "Minimum temperatuer value of upper slope after shifting it"
       annotation (Placement(transformation(extent={{10,149},{30,171}})));
@@ -110,8 +109,7 @@ package Controls "Package of control blocks for distribution systems"
       "Lower value of lower slope after shifting it"
       annotation (Placement(transformation(extent={{-30,110},{-10,130}})));
     Buildings.Controls.OBC.CDL.Continuous.AddParameter TMin_upper(
-      final p=+dTSlo,
-      final k=1,
+      final p=dTSlo,
       y(final unit="K", displayUnit="degC"))
       "Maximum temperatuer value of lower slope after shifting it"
       annotation (Placement(transformation(extent={{10,110},{30,130}})));
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/CoolingTowersWithBypass.mo b/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/CoolingTowersWithBypass.mo
index 10e23b98848..a2bbebddfc6 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/CoolingTowersWithBypass.mo
+++ b/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/CoolingTowersWithBypass.mo
@@ -144,8 +144,7 @@ model CoolingTowersWithBypass
     "Compare if (TWetBul+dTApp) is greater than TMin"
     annotation (Placement(transformation(extent={{-70,40},{-50,60}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar(
-    p=dTApp,
-    k=1)
+    p=dTApp)
     "Add approach temperature on top of wetbulb temperature"
     annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
   Buildings.Fluid.FixedResistances.Junction jun(
@@ -172,19 +171,19 @@ equation
   connect(senTCWSup.port_b,port_b)
     annotation (Line(points={{80,0},{100,0}},color={0,127,255}));
   connect(TSetByp.y,bypValCon.u_s)
-    annotation (Line(points={{-69,-50},{-62,-50}},color={0,0,127}));
+    annotation (Line(points={{-68,-50},{-62,-50}},color={0,0,127}));
   connect(senTCWSup.T,bypValCon.u_m)
     annotation (Line(points={{70,11},{70,30},{54,30},{54,-80},{-50,-80},{-50,-62}},
                                                                     color={0,0,127}));
   connect(valByp.port_b,senTCWSup.port_a)
     annotation (Line(points={{10,-40},{30,-40},{30,0},{60,0}},color={0,127,255}));
   connect(cooTowSpeCon.y,cooTowSys.uFanSpe)
-    annotation (Line(points={{11,50},{16,50},{16,14},{-18,14},{-18,2},{-12,2}},
+    annotation (Line(points={{12,50},{16,50},{16,14},{-18,14},{-18,2},{-12,2}},
       color={0,0,127}));
   connect(cooTowSys.PFan,PFan)
     annotation (Line(points={{11,6},{40,6},{40,60},{110,60}},color={0,0,127}));
   connect(bypValCon.y,valByp.y)
-    annotation (Line(points={{-39,-50},{-20,-50},{-20,-20},{0,-20},{0,-28}},
+    annotation (Line(points={{-38,-50},{-20,-50},{-20,-20},{0,-20},{0,-28}},
       color={0,0,127}));
   connect(senTCWSup.T,cooTowSpeCon.u_m)
     annotation (Line(points={{70,11},{70,30},{0,30},{0,38}},
@@ -194,7 +193,7 @@ equation
   connect(cooTowSpeCon.u_s,swi.y)
     annotation (Line(points={{-12,50},{-18,50}},color={0,0,127}));
   connect(TSetByp.y,swi.u3)
-    annotation (Line(points={{-69,-50},{-66,-50},{-66,34},{-46,34},{-46,42},{-42,
+    annotation (Line(points={{-68,-50},{-66,-50},{-66,34},{-46,34},{-46,42},{-42,
           42}},          color={0,0,127}));
   connect(TWetBul,addPar.u)
     annotation (Line(points={{-120,-20},{-86,-20},{-86,80},{-82,80}},
@@ -206,7 +205,7 @@ equation
     annotation (Line(points={{-120,40},{-80,40},{-80,6},{-12,6}},
       color={255,0,255}));
   connect(on[1],bypValCon.trigger)
-    annotation (Line(points={{-120,40},{-80,40},{-80,-28},{-94,-28},{-94,-80},{-56,
+    annotation (Line(points={{-120,30},{-80,30},{-80,-28},{-94,-28},{-94,-80},{-56,
           -80},{-56,-62}},
       color={255,0,255}));
   connect(port_a, jun.port_1)
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Continuous/AddParameter.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/AddParameter.mo
new file mode 100644
index 00000000000..891a22301a0
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/AddParameter.mo
@@ -0,0 +1,89 @@
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous;
+block AddParameter "Output the sum of an input plus a parameter"
+  extends Modelica.Icons.ObsoleteModel;
+
+  parameter Real p
+    "Value to be added";
+  parameter Real k
+    "Gain of input";
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
+    "Connector of Real input signal"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
+    "Connector of Real output signal"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
+
+equation
+  y=k*u+p;
+  annotation (
+    defaultComponentName="addPar",
+    obsolete = "This model is obsolete",
+    Documentation(
+      info="<html>
+<p>
+Block that outputs <code>y = k u + p</code>,
+where <code>k</code> and <code>p</code> are
+parameters and <code>u</code> is an input.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 2, 2020, by Michael Wetter:<br/>
+Changed icon to display dynamically the output value.
+</li>
+<li>
+January 3, 2017, by Michael Wetter:<br/>
+First implementation, based on the implementation of the
+Modelica Standard Library.
+</li>
+</ul>
+</html>"),
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          textColor={0,0,255},
+          extent={{-150,110},{150,150}},
+          textString="%name"),
+        Line(
+          points={{-54,66},{-28,30},{2,30}},
+          color={0,0,127}),
+        Line(
+          points={{-100,0},{100,0}},
+          color={0,0,127}),
+        Text(
+          extent={{-122,58},{-17,98}},
+          textString="%p",
+          textColor={0,0,0}),
+        Polygon(
+          points={{-86,-36},{-86,36},{-34,0},{-86,-36}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-196,-84},{104,-44}},
+          textColor={0,0,0},
+          textString="k=%k"),
+        Ellipse(
+          lineColor={0,0,127},
+          extent={{-12,-52},{88,48}},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-2,-22},{74,46}},
+          textString="+"),
+        Text(
+          extent={{226,60},{106,10}},
+          textColor={0,0,0},
+          textString=DynamicSelect("",String(y,
+            leftJustified=false,
+            significantDigits=3)))}));
+end AddParameter;
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/AddParameter.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/AddParameter.mo
new file mode 100644
index 00000000000..bd1acc76177
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/AddParameter.mo
@@ -0,0 +1,56 @@
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation;
+model AddParameter "Validation model for the AddParameter block"
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.AddParameter addPar(
+    p=0.5,
+    k=1.0)
+    "Block that outputs the sum of an input plus a parameter"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1(
+    duration=1,
+    offset=-2,
+    height=4)
+    "Block that generates ramp signal"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+
+equation
+  connect(ramp1.y,addPar.u)
+    annotation (Line(points={{-38,0},{-38,0},{-12,0}},color={0,0,127}));
+  annotation (
+    experiment(
+      StopTime=1.0,
+      Tolerance=1e-06),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/AddParameter.mos" "Simulate and plot"),
+    Documentation(
+      info="<html>
+<p>
+Validation test for the block
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Continuous.AddParameter\">
+Buildings.Obsolete.Controls.OBC.CDL.Continuous.AddParameter</a>.
+</p>
+<p>
+The input <code>u</code> varies from <i>-2</i> to <i>+2</i>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 17, 2017, by Jianjun Hu:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}));
+end AddParameter;
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/package.order b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/package.order
index 169709a4f2b..8c6b38fbc43 100644
--- a/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/package.order
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/package.order
@@ -1,4 +1,5 @@
 Add
+AddParameter
 ChangeSign
 Derivative
 Feedback
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Continuous/package.order b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/package.order
index d456cd22bec..cb18911402b 100644
--- a/Buildings/Obsolete/Controls/OBC/CDL/Continuous/package.order
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/package.order
@@ -1,4 +1,5 @@
 Add
+AddParameter
 ChangeSign
 Derivative
 Feedback
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Continuous_Validation_AddParameter.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Continuous_Validation_AddParameter.txt
index 353d2ba8021..d66377d4109 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Continuous_Validation_AddParameter.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Continuous_Validation_AddParameter.txt
@@ -1,10 +1,10 @@
-last-generated=2017-04-06
+last-generated=2022-02-03
 statistics-simulation=
 {
-  "numerical Jacobians": "0", 
-  "nonlinear": " ", 
-  "linear": " "
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
 }
-addPar.y=[-1.5e+00, -1.460000037252901e+00, -1.419999955296513e+00, -1.379999992549417e+00, -1.340000029802316e+00, -1.299999955296522e+00, -1.259999985098829e+00, -1.220000029802327e+00, -1.179999940395462e+00, -1.14e+00, -1.100000029802322e+00, -1.059999940395391e+00, -1.019999970197678e+00, -9.8e-01, -9.399999999999999e-01, -9e-01, -8.6e-01, -8.2e-01, -7.8e-01, -7.4e-01, -7e-01, -6.6e-01, -6.2e-01, -5.8e-01, -5.4e-01, -5e-01, -4.599999701976776e-01, -4.200000298023223e-01, -3.799999999999999e-01, -3.399999701976777e-01, -3.000000596044672e-01, -2.6e-01, -2.199999701977309e-01, -1.800000596044493e-01, -1.400000149011345e-01, -9.999997764830271e-02, -6.000005587927459e-02, -2.000001862641598e-02, 2.000001862641598e-02, 6.000005587927459e-02, 9.999997764830271e-02, 1.400000149011345e-01, 1.800000596044493e-01, 2.199999701977309e-01, 2.6e-01, 3.000000596044672e-01, 3.399999701976777e-01, 3.799999999999999e-01, 4.200000298023223e-01, 4.599999701976776e-01, 5e-01, 5.400000596037922e-01, 5.80000059603508e-01, 6.200001192075844e-01, 6.599999403966343e-01, 6.999999403960659e-01, 7.399999999998581e-01, 7.799999999995735e-01, 8.200000596036499e-01, 8.600001192069446e-01, 8.99999880792842e-01, 9.399999403962078e-01, 9.800000000002842e-01, 1.019999999999716e+00, 1.059999999999147e+00, 1.100000119207869e+00, 1.139999880792274e+00, 1.1799998807927e+00, 1.220000000000427e+00, 1.260000000000142e+00, 1.299999999999289e+00, 1.34000011920801e+00, 1.379999880792416e+00, 1.419999880791847e+00, 1.460000000000568e+00, 1.5e+00, 1.539999999999432e+00, 1.580000119208153e+00, 1.620000119207584e+00, 1.65999988079199e+00, 1.700000000000711e+00, 1.739999999999858e+00, 1.779999999999573e+00, 1.8200001192073e+00, 1.860000119207726e+00, 1.899999880792131e+00, 1.940000000000853e+00, 1.980000000000284e+00, 2.02e+00, 2.06e+00, 2.1e+00, 2.14e+00, 2.18e+00, 2.22e+00, 2.26e+00, 2.3e+00, 2.34e+00, 2.38e+00, 2.42e+00, 2.46e+00, 2.5e+00]
-addPar.u=[-2e+00, -1.960000037252901e+00, -1.919999955296513e+00, -1.879999992549417e+00, -1.840000029802316e+00, -1.799999955296522e+00, -1.759999985098829e+00, -1.720000029802327e+00, -1.679999940395462e+00, -1.64e+00, -1.600000029802322e+00, -1.559999940395391e+00, -1.519999970197678e+00, -1.48e+00, -1.440000059604609e+00, -1.4e+00, -1.36e+00, -1.320000059604538e+00, -1.28e+00, -1.24e+00, -1.200000059604467e+00, -1.159999940395355e+00, -1.12e+00, -1.080000059604645e+00, -1.039999940395355e+00, -1e+00, -9.599999403956394e-01, -9.20000059604325e-01, -8.799999999999999e-01, -8.39999940395604e-01, -8.000000596046448e-01, -7.6e-01, -7.2e-01, -6.800000596046447e-01, -6.399999999999999e-01, -6.000000000000001e-01, -5.600000596046448e-01, -5.2e-01, -4.799999701977486e-01, -4.399999403955683e-01, -4.000000298022335e-01, -3.600000000000001e-01, -3.199999403955507e-01, -2.800000298022158e-01, -2.399999850988566e-01, -1.999999552966052e-01, -1.600000298022601e-01, -1.199999925494328e-01, -7.999995529659643e-02, -4.000003725283197e-02, 0e+00, 4.000003725226355e-02, 8.000007450452709e-02, 1.200001117568972e-01, 1.599999105944718e-01, 1.99999955297316e-01, 2.399999850987147e-01, 2.800000298017893e-01, 3.200000596036499e-01, 3.600001192073355e-01, 3.999999105944538e-01, 4.39999940396421e-01, 4.799999701980329e-01, 5.199999999997158e-01, 5.600000596037922e-01, 6.00000119207158e-01, 6.399998807930554e-01, 6.799999403963501e-01, 7.200000000004265e-01, 7.600000000001419e-01, 8.000000596039341e-01, 8.400000596033657e-01, 8.799998807924156e-01, 9.19999940396492e-01, 9.599999403962078e-01, 1e+00, 1.039999999999432e+00, 1.080000119208153e+00, 1.120000119207584e+00, 1.15999988079199e+00, 1.200000000000711e+00, 1.239999999999858e+00, 1.279999999999573e+00, 1.3200001192073e+00, 1.360000119207726e+00, 1.399999880792131e+00, 1.440000000000853e+00, 1.480000000000284e+00, 1.519999999999716e+00, 1.559999999999147e+00, 1.600000119207869e+00, 1.639999880792274e+00, 1.6799998807927e+00, 1.720000000000427e+00, 1.760000000000142e+00, 1.799999999999289e+00, 1.84000011920801e+00, 1.879999880792416e+00, 1.919999880791847e+00, 1.960000000000568e+00, 2e+00]
 time=[0e+00, 1e+00]
+addPar.u=[-2e+00, -1.960000037252901e+00, -1.919999955296513e+00, -1.879999992549417e+00, -1.840000029802316e+00, -1.799999955296522e+00, -1.759999985098829e+00, -1.720000029802327e+00, -1.679999940395462e+00, -1.64e+00, -1.600000029802322e+00, -1.559999940395391e+00, -1.519999970197678e+00, -1.48e+00, -1.440000059604609e+00, -1.4e+00, -1.36e+00, -1.320000059604538e+00, -1.28e+00, -1.24e+00, -1.200000059604467e+00, -1.159999940395355e+00, -1.12e+00, -1.080000059604645e+00, -1.039999940395355e+00, -1e+00, -9.599999403956394e-01, -9.20000059604325e-01, -8.799999999999999e-01, -8.39999940395604e-01, -8.000000596046448e-01, -7.6e-01, -7.2e-01, -6.800000596046447e-01, -6.399999999999999e-01, -6.000000000000001e-01, -5.600000596046448e-01, -5.2e-01, -4.799999701977486e-01, -4.399999403955683e-01, -4.000000298022335e-01, -3.600000000000001e-01, -3.199999403955507e-01, -2.800000298022158e-01, -2.399999850988566e-01, -1.999999552966052e-01, -1.600000298022601e-01, -1.199999925494328e-01, -7.999995529659643e-02, -4.000003725283197e-02, 1.332267629550188e-15, 4.000003725226355e-02, 8.000007450452709e-02, 1.200001117568972e-01, 1.599999105944718e-01, 1.99999955297316e-01, 2.399999850987147e-01, 2.800000298017893e-01, 3.200000596036499e-01, 3.600001192073355e-01, 3.999999105944538e-01, 4.39999940396421e-01, 4.799999701980329e-01, 5.199999999997158e-01, 5.600000596037922e-01, 6.00000119207158e-01, 6.399998807930554e-01, 6.799999403963501e-01, 7.200000000004265e-01, 7.600000000001419e-01, 8.000000596039341e-01, 8.400000596033657e-01, 8.799998807924156e-01, 9.19999940396492e-01, 9.599999403962078e-01, 1e+00, 1.039999999999432e+00, 1.080000119208153e+00, 1.120000119207584e+00, 1.15999988079199e+00, 1.200000000000711e+00, 1.239999999999858e+00, 1.279999999999573e+00, 1.3200001192073e+00, 1.360000119207726e+00, 1.399999880792131e+00, 1.440000000000853e+00, 1.480000000000284e+00, 1.519999999999716e+00, 1.559999999999147e+00, 1.600000119207869e+00, 1.639999880792274e+00, 1.6799998807927e+00, 1.720000000000427e+00, 1.760000000000142e+00, 1.799999999999289e+00, 1.84000011920801e+00, 1.879999880792416e+00, 1.919999880791847e+00, 1.960000000000568e+00, 2e+00]
+addPar.y=[-1.5e+00, -1.460000037252901e+00, -1.419999955296513e+00, -1.379999992549417e+00, -1.340000029802316e+00, -1.299999955296522e+00, -1.259999985098829e+00, -1.220000029802327e+00, -1.179999940395462e+00, -1.14e+00, -1.100000029802322e+00, -1.059999940395391e+00, -1.019999970197678e+00, -9.8e-01, -9.399999999999999e-01, -9e-01, -8.6e-01, -8.2e-01, -7.8e-01, -7.4e-01, -7e-01, -6.6e-01, -6.2e-01, -5.8e-01, -5.4e-01, -5e-01, -4.599999701976776e-01, -4.200000298023223e-01, -3.799999999999999e-01, -3.399999701976777e-01, -3.000000596044672e-01, -2.6e-01, -2.199999701977309e-01, -1.800000596044493e-01, -1.400000149011345e-01, -9.999997764830271e-02, -6.000005587927459e-02, -2.000001862641598e-02, 2.000001862641598e-02, 6.000005587927459e-02, 9.999997764830271e-02, 1.400000149011345e-01, 1.800000596044493e-01, 2.199999701977309e-01, 2.6e-01, 3.000000596044672e-01, 3.399999701976777e-01, 3.799999999999999e-01, 4.200000298023223e-01, 4.599999701976776e-01, 5e-01, 5.400000596037922e-01, 5.80000059603508e-01, 6.200001192075844e-01, 6.599999403966343e-01, 6.999999403960659e-01, 7.399999999998581e-01, 7.799999999995735e-01, 8.200000596036499e-01, 8.600001192069446e-01, 8.99999880792842e-01, 9.399999403962078e-01, 9.800000000002842e-01, 1.019999999999716e+00, 1.059999999999147e+00, 1.100000119207869e+00, 1.139999880792274e+00, 1.1799998807927e+00, 1.220000000000427e+00, 1.260000000000142e+00, 1.299999999999289e+00, 1.34000011920801e+00, 1.379999880792416e+00, 1.419999880791847e+00, 1.460000000000568e+00, 1.5e+00, 1.539999999999432e+00, 1.580000119208153e+00, 1.620000119207584e+00, 1.65999988079199e+00, 1.700000000000711e+00, 1.739999999999858e+00, 1.779999999999573e+00, 1.8200001192073e+00, 1.860000119207726e+00, 1.899999880792131e+00, 1.940000000000853e+00, 1.980000000000284e+00, 2.02e+00, 2.06e+00, 2.1e+00, 2.14e+00, 2.18e+00, 2.22e+00, 2.26e+00, 2.3e+00, 2.34e+00, 2.38e+00, 2.42e+00, 2.46e+00, 2.5e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Integers_Validation_AddParameter.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Integers_Validation_AddParameter.txt
new file mode 100644
index 00000000000..3cf1debbee5
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Integers_Validation_AddParameter.txt
@@ -0,0 +1,10 @@
+last-generated=2022-02-04
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+00]
+addPar.u=[-4e+00, -3e+00, -3e+00, -3e+00, -3e+00, -3e+00, -3e+00, -3e+00, -3e+00, -3e+00, -3e+00, -3e+00, -3e+00, -3e+00, -3e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -5.006780019356505e-06, 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, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00]
+addPar.y=[1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4.999994993219981e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 7e+00, 7e+00, 7e+00, 7e+00, 7e+00, 7e+00, 7e+00, 7e+00, 7e+00, 7e+00, 7e+00, 7e+00, 7e+00, 7e+00, 8e+00, 8e+00, 8e+00, 8e+00, 8e+00, 8e+00, 8e+00, 8e+00, 8e+00, 8e+00, 8e+00, 8e+00, 8e+00, 8e+00, 8e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Obsolete_Controls_OBC_CDL_Continuous_Validation_AddParameter.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Obsolete_Controls_OBC_CDL_Continuous_Validation_AddParameter.txt
new file mode 100644
index 00000000000..353d2ba8021
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Obsolete_Controls_OBC_CDL_Continuous_Validation_AddParameter.txt
@@ -0,0 +1,10 @@
+last-generated=2017-04-06
+statistics-simulation=
+{
+  "numerical Jacobians": "0", 
+  "nonlinear": " ", 
+  "linear": " "
+}
+addPar.y=[-1.5e+00, -1.460000037252901e+00, -1.419999955296513e+00, -1.379999992549417e+00, -1.340000029802316e+00, -1.299999955296522e+00, -1.259999985098829e+00, -1.220000029802327e+00, -1.179999940395462e+00, -1.14e+00, -1.100000029802322e+00, -1.059999940395391e+00, -1.019999970197678e+00, -9.8e-01, -9.399999999999999e-01, -9e-01, -8.6e-01, -8.2e-01, -7.8e-01, -7.4e-01, -7e-01, -6.6e-01, -6.2e-01, -5.8e-01, -5.4e-01, -5e-01, -4.599999701976776e-01, -4.200000298023223e-01, -3.799999999999999e-01, -3.399999701976777e-01, -3.000000596044672e-01, -2.6e-01, -2.199999701977309e-01, -1.800000596044493e-01, -1.400000149011345e-01, -9.999997764830271e-02, -6.000005587927459e-02, -2.000001862641598e-02, 2.000001862641598e-02, 6.000005587927459e-02, 9.999997764830271e-02, 1.400000149011345e-01, 1.800000596044493e-01, 2.199999701977309e-01, 2.6e-01, 3.000000596044672e-01, 3.399999701976777e-01, 3.799999999999999e-01, 4.200000298023223e-01, 4.599999701976776e-01, 5e-01, 5.400000596037922e-01, 5.80000059603508e-01, 6.200001192075844e-01, 6.599999403966343e-01, 6.999999403960659e-01, 7.399999999998581e-01, 7.799999999995735e-01, 8.200000596036499e-01, 8.600001192069446e-01, 8.99999880792842e-01, 9.399999403962078e-01, 9.800000000002842e-01, 1.019999999999716e+00, 1.059999999999147e+00, 1.100000119207869e+00, 1.139999880792274e+00, 1.1799998807927e+00, 1.220000000000427e+00, 1.260000000000142e+00, 1.299999999999289e+00, 1.34000011920801e+00, 1.379999880792416e+00, 1.419999880791847e+00, 1.460000000000568e+00, 1.5e+00, 1.539999999999432e+00, 1.580000119208153e+00, 1.620000119207584e+00, 1.65999988079199e+00, 1.700000000000711e+00, 1.739999999999858e+00, 1.779999999999573e+00, 1.8200001192073e+00, 1.860000119207726e+00, 1.899999880792131e+00, 1.940000000000853e+00, 1.980000000000284e+00, 2.02e+00, 2.06e+00, 2.1e+00, 2.14e+00, 2.18e+00, 2.22e+00, 2.26e+00, 2.3e+00, 2.34e+00, 2.38e+00, 2.42e+00, 2.46e+00, 2.5e+00]
+addPar.u=[-2e+00, -1.960000037252901e+00, -1.919999955296513e+00, -1.879999992549417e+00, -1.840000029802316e+00, -1.799999955296522e+00, -1.759999985098829e+00, -1.720000029802327e+00, -1.679999940395462e+00, -1.64e+00, -1.600000029802322e+00, -1.559999940395391e+00, -1.519999970197678e+00, -1.48e+00, -1.440000059604609e+00, -1.4e+00, -1.36e+00, -1.320000059604538e+00, -1.28e+00, -1.24e+00, -1.200000059604467e+00, -1.159999940395355e+00, -1.12e+00, -1.080000059604645e+00, -1.039999940395355e+00, -1e+00, -9.599999403956394e-01, -9.20000059604325e-01, -8.799999999999999e-01, -8.39999940395604e-01, -8.000000596046448e-01, -7.6e-01, -7.2e-01, -6.800000596046447e-01, -6.399999999999999e-01, -6.000000000000001e-01, -5.600000596046448e-01, -5.2e-01, -4.799999701977486e-01, -4.399999403955683e-01, -4.000000298022335e-01, -3.600000000000001e-01, -3.199999403955507e-01, -2.800000298022158e-01, -2.399999850988566e-01, -1.999999552966052e-01, -1.600000298022601e-01, -1.199999925494328e-01, -7.999995529659643e-02, -4.000003725283197e-02, 0e+00, 4.000003725226355e-02, 8.000007450452709e-02, 1.200001117568972e-01, 1.599999105944718e-01, 1.99999955297316e-01, 2.399999850987147e-01, 2.800000298017893e-01, 3.200000596036499e-01, 3.600001192073355e-01, 3.999999105944538e-01, 4.39999940396421e-01, 4.799999701980329e-01, 5.199999999997158e-01, 5.600000596037922e-01, 6.00000119207158e-01, 6.399998807930554e-01, 6.799999403963501e-01, 7.200000000004265e-01, 7.600000000001419e-01, 8.000000596039341e-01, 8.400000596033657e-01, 8.799998807924156e-01, 9.19999940396492e-01, 9.599999403962078e-01, 1e+00, 1.039999999999432e+00, 1.080000119208153e+00, 1.120000119207584e+00, 1.15999988079199e+00, 1.200000000000711e+00, 1.239999999999858e+00, 1.279999999999573e+00, 1.3200001192073e+00, 1.360000119207726e+00, 1.399999880792131e+00, 1.440000000000853e+00, 1.480000000000284e+00, 1.519999999999716e+00, 1.559999999999147e+00, 1.600000119207869e+00, 1.639999880792274e+00, 1.6799998807927e+00, 1.720000000000427e+00, 1.760000000000142e+00, 1.799999999999289e+00, 1.84000011920801e+00, 1.879999880792416e+00, 1.919999880791847e+00, 1.960000000000568e+00, 2e+00]
+time=[0e+00, 1e+00]
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/AddParameter.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/AddParameter.mos
index 66c1502d497..4af5d76f076 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/AddParameter.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/AddParameter.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.AddParameter", method="Cvode", tolerance=1e-06, stopTime=1.0, resultFile="AddParameter1");
+simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.AddParameter", method="Cvode", tolerance=1e-06, stopTime=1.0, resultFile="AddParameter2");
 createPlot(id=1, position={15, 10, 590, 420}, y={"addPar.u", "addPar.y"}, range={0.0, 1.0, -4, 5}, grid=true, colors={{238,46,47}, {28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/AddParameter.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/AddParameter.mos
new file mode 100644
index 00000000000..315e38a5b6c
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/AddParameter.mos
@@ -0,0 +1,2 @@
+simulateModel("Buildings.Controls.OBC.CDL.Integers.Validation.AddParameter", method="Cvode", tolerance=1e-06, stopTime=1.0, resultFile="AddParameter3");
+createPlot(id=1, position={15, 10, 590, 420}, y={"addPar.u", "addPar.y"}, range={0.0, 1.0, -4, 5}, grid=true, colors={{238,46,47}, {28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/ConvertBuildings_from_8_to_9.0.0.mos b/Buildings/Resources/Scripts/Dymola/ConvertBuildings_from_8_to_9.0.0.mos
index e8a4b8877ca..e31735ff024 100644
--- a/Buildings/Resources/Scripts/Dymola/ConvertBuildings_from_8_to_9.0.0.mos
+++ b/Buildings/Resources/Scripts/Dymola/ConvertBuildings_from_8_to_9.0.0.mos
@@ -5,6 +5,10 @@ clear
 
 convertClear();
 
+// Conversion for https://github.com/lbl-srg/modelica-buildings/issues/2876
+convertClass("Buildings.Controls.OBC.CDL.Continuous.AddParameter",
+             "Buildings.Obsolete.Controls.OBC.CDL.Continuous.AddParameter");
+
 // Conversion for https://github.com/lbl-srg/modelica-buildings/issues/2865
 convertClass("Buildings.Controls.OBC.CDL.Continuous.Add",
              "Buildings.Obsolete.Controls.OBC.CDL.Continuous.Add");
diff --git a/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/AddParameter.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/AddParameter.mos
new file mode 100644
index 00000000000..80df7b80d59
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/AddParameter.mos
@@ -0,0 +1,2 @@
+simulateModel("Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.AddParameter", method="Cvode", tolerance=1e-06, stopTime=1.0, resultFile="AddParameter1");
+createPlot(id=1, position={15, 10, 590, 420}, y={"addPar.u", "addPar.y"}, range={0.0, 1.0, -4, 5}, grid=true, colors={{238,46,47}, {28,108,200}});
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.AddParameter.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.AddParameter.mos
new file mode 100644
index 00000000000..50e72f6e27f
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.AddParameter.mos
@@ -0,0 +1,5 @@
+compareVars :=
+  {
+    "addPar.u",
+    "addPar.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.AddParameter.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.AddParameter.mos
new file mode 100644
index 00000000000..50e72f6e27f
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.AddParameter.mos
@@ -0,0 +1,5 @@
+compareVars :=
+  {
+    "addPar.u",
+    "addPar.y"
+  };
diff --git a/Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py b/Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py
index f554793f030..ad7fba8b2ac 100644
--- a/Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py
+++ b/Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py
@@ -482,9 +482,12 @@ def write_unit_converters(self):
             "  constant Real k = " + x['multiplier'] + " \"Multiplier\";\n"\
             "  constant Real p = " + x['adder'] + " \"Adder\";\n"
             "\n"\
+            "  Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai(\n"\
+            "    final k = k) \"Gain factor\"\n"\
+            "    annotation (Placement(transformation(extent={{-68,-10},{-48,10}})));\n"\
+            "\n"\
             "  Buildings.Controls.OBC.CDL.Continuous.AddParameter conv(\n"\
-            "    final p = p,\n"\
-            "    final k = k) \"Unit converter\"\n"\
+            "    final p = p) \"Unit converter\"\n"\
             "    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));\n"\
             "\n")
             else:
@@ -495,12 +498,24 @@ def write_unit_converters(self):
             "    final k = k) \"Unit converter\"\n"\
             "    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));\n"\
             "\n")
-            file.write(\
+            if int(eval(x['adder'])) != 0:
+                file.write(\
+            "equation\n"\
+            "  connect(conv.y, y)\n"\
+            "    annotation (Line(points={{12,0},{60,0},{60,0},{120,0}},color={0,0,127}));\n"\
+            "  connect(u, gai.u)\n"\
+            "    annotation (Line(points={{-120,0},{-70,0}}, color={0,0,127}));\n"\
+            "  connect(gai.y, conv.u)\n"\
+            "    annotation (Line(points={{-46,0},{-12,0}}, color={0,0,127}));\n"\
+            "\n")
+            else:
+                file.write(\
             "equation\n"\
             "  connect(u, conv.u)\n"\
             "    annotation (Line(points={{-120,0},{-12,0}},color={0,0,127}));\n"\
             "  connect(conv.y, y)\n"\
-            "    annotation (Line(points={{12,0},{120,0}},color={0,0,127}));\n"\
+            "    annotation (Line(points={{12,0},{120,0}},color={0,0,127}));\n")
+            file.write(\
             "  annotation (\n"\
             "      defaultComponentName = \"" + model_name[0].lower() + model_name[1:]  + "\",\n"\
             "    Icon(graphics={\n"\
diff --git a/Buildings/ThermalZones/Detailed/Examples/MixedAirCO2.mo b/Buildings/ThermalZones/Detailed/Examples/MixedAirCO2.mo
index a4cf6be66d6..04dd4c386f1 100644
--- a/Buildings/ThermalZones/Detailed/Examples/MixedAirCO2.mo
+++ b/Buildings/ThermalZones/Detailed/Examples/MixedAirCO2.mo
@@ -24,10 +24,10 @@ model MixedAirCO2
     annotation (Placement(transformation(extent={{70,-60},{90,-40}})));
   Modelica.Blocks.Sources.Constant CO2Set(k=700)
     "CO2 set point in PPM above the initial value"
-    annotation (Placement(transformation(extent={{-160,-130},{-140,-110}})));
+    annotation (Placement(transformation(extent={{-170,-130},{-150,-110}})));
   Modelica.Blocks.Math.Gain norCO2Set(k=1/700)
     "Normalization for CO2 set point" annotation (
-      Placement(transformation(extent={{-120,-130},{-100,-110}})));
+      Placement(transformation(extent={{-140,-130},{-120,-110}})));
   Modelica.Blocks.Math.Gain norCO2Mea(k=1/700)
     "Normalization for CO2 measurement" annotation (
       Placement(transformation(extent={{-120,-160},{-100,-140}})));
@@ -38,36 +38,39 @@ model MixedAirCO2
     yMin=0,
     reverseActing=false)
     "PI controller for fresh air supply, with negative minimum because of reverse action"
-    annotation (Placement(transformation(extent={{-80,-130},{-60,-110}})));
+    annotation (Placement(transformation(extent={{-100,-130},{-80,-110}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addFlo(
-    p = -mOut_flow,
+    p = 1)
+    "Gain that increases the mass flow rate above its typical value"
+    annotation (Placement(transformation(extent={{-70,-130},{-50,-110}})));
+  Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gaiFac(
     k=-mOut_flow)
     "Gain that increases the mass flow rate above its typical value"
-    annotation (Placement(transformation(extent={{-50,-130},{-30,-110}})));
+    annotation (Placement(transformation(extent={{-40,-130},{-20,-110}})));
+
 equation
   connect(roo.C_flow[1], gaiCO2.y) annotation (Line(points={{60.4,6.8},{36,6.8},
-          {36,-30},{21,-30}},
-                            color={0,0,127}));
+          {36,-30},{21,-30}}, color={0,0,127}));
   connect(nPer.y, gaiCO2.u) annotation (Line(points={{-59,-10},{-59,-10},{-50,-10},
-          {-50,-30},{-2,-30}},
-                             color={0,0,127}));
+          {-50,-30},{-2,-30}}, color={0,0,127}));
   connect(senCO2.port, roo.ports[3]) annotation (Line(points={{80,-60},{80,-70},
           {62,-70},{62,-6},{67,-6}}, color={0,127,255}));
   connect(CO2Set.y, norCO2Set.u)
-    annotation (Line(points={{-139,-120},{-139,-120},{-122,-120}},
-                                                   color={0,0,127}));
+    annotation (Line(points={{-149,-120},{-142,-120}}, color={0,0,127}));
   connect(senCO2.ppm, norCO2Mea.u) annotation (Line(points={{91,-50},{92,-50},{96,
           -50},{100,-50},{100,-170},{-140,-170},{-140,-150},{-122,-150}}, color=
          {0,0,127}));
   connect(norCO2Set.y, conPI.u_s)
-    annotation (Line(points={{-99,-120},{-82,-120}},         color={0,0,127}));
-  connect(norCO2Mea.y, conPI.u_m) annotation (Line(points={{-99,-150},{-99,-150},
-          {-70,-150},{-70,-132}}, color={0,0,127}));
+    annotation (Line(points={{-119,-120},{-102,-120}}, color={0,0,127}));
+  connect(norCO2Mea.y, conPI.u_m) annotation (Line(points={{-99,-150},{-90,-150},
+          {-90,-132}}, color={0,0,127}));
   connect(conPI.y,addFlo. u)
-    annotation (Line(points={{-59,-120},{-52,-120}}, color={0,0,127}));
-  connect(addFlo.y, bou.m_flow_in) annotation (Line(points={{-28,-120},{-16,-120},
-          {-16,-112},{-12,-112}},
-                               color={0,0,127}));
+    annotation (Line(points={{-79,-120},{-72,-120}}, color={0,0,127}));
+  connect(addFlo.y, gaiFac.u)
+    annotation (Line(points={{-48,-120},{-42,-120}}, color={0,0,127}));
+  connect(gaiFac.y, bou.m_flow_in) annotation (Line(points={{-18,-120},{-16,-120},{
+          -16,-112},{-12,-112}}, color={0,0,127}));
+
   annotation (
   Documentation(info="<html>
 <p>
@@ -113,12 +116,12 @@ experiment(StopTime=86400, Tolerance=1e-06),
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{-168,-90},{-20,-166}},
+          extent={{-172,-96},{-20,-172}},
           lineColor={0,0,0},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid),
         Text(
-          extent={{-164,-86},{-92,-108}},
+          extent={{-164,-90},{-92,-112}},
           textColor={0,0,0},
           horizontalAlignment=TextAlignment.Left,
           textString="Feedback control for fresh air"),
diff --git a/Buildings/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloorHeater.mo b/Buildings/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloorHeater.mo
index eeb0e279589..c6559c193b3 100644
--- a/Buildings/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloorHeater.mo
+++ b/Buildings/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloorHeater.mo
@@ -12,8 +12,9 @@ model SingleZoneFloorHeater
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TSetRoo(
     unit="K",
     displayUnit="degC")
-    "Room setpoint temperature" annotation (Placement(transformation(extent={{-140,
-            -80},{-100,-40}}), iconTransformation(extent={{-140,-80},{-100,-40}})));
+    "Room setpoint temperature"
+    annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yEHea(
     unit="J")
     "Heating energy"
@@ -24,17 +25,20 @@ model SingleZoneFloorHeater
     displayUnit="degC")
     "Measured room temperature"
     annotation (Placement(transformation(extent={{-140,-110},{-100,-70}}),
-    iconTransformation(extent={{-140,-110},{-100,-70}})));
+      iconTransformation(extent={{-140,-110},{-100,-70}})));
 
   Buildings.Controls.OBC.CDL.Continuous.PID conPID(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
     Ti=900,
     u_s(unit="K", displayUnit="degC"),
     u_m(unit="K", displayUnit="degC")) "Controller for heater"
-    annotation (Placement(transformation(extent={{-60,-70},{-40,-50}})));
+    annotation (Placement(transformation(extent={{-80,-70},{-60,-50}})));
+  Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai(
+    k=20)
+    "Gain factor"
+    annotation (Placement(transformation(extent={{-48,-70},{-28,-50}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar(
     p=273.15 + 10,
-    k=20,
     y(unit="K", displayUnit="degC"))
     "Compute the leaving water setpoint temperature"
     annotation (Placement(transformation(extent={{-20,-70},{0,-50}})));
@@ -57,19 +61,24 @@ model SingleZoneFloorHeater
 equation
   connect(hea.Q_flow, EHea.u) annotation (Line(points={{41,8},{50,8},{50,-80},{
           58,-80}}, color={0,0,127}));
-  connect(addPar.y, hea.TSet) annotation (Line(points={{2,-60},{10,-60},{10,8},
-          {18,8}}, color={0,0,127}));
-  connect(conPID.y, addPar.u)  annotation (Line(points={{-38,-60},{-22,-60}},color={0,0,127}));
+  connect(addPar.y, hea.TSet) annotation (Line(points={{2,-60},{8,-60},{8,8},{18,
+          8}},     color={0,0,127}));
   connect(fan.port_b, hea.port_a)
     annotation (Line(points={{-40,0},{20,0}}, color={0,127,255}));
-  connect(TRooMea, conPID.u_m)  annotation (Line(points={{-120,-90},{-50,-90},{-50,-72}},color={0,0,127}));
-  connect(TSetRoo, conPID.u_s) annotation (Line(points={{-120,-60},{-62,-60}},
+  connect(TRooMea, conPID.u_m)  annotation (Line(points={{-120,-90},{-70,-90},{-70,
+          -72}},  color={0,0,127}));
+  connect(TSetRoo, conPID.u_s) annotation (Line(points={{-120,-60},{-82,-60}},
                          color={0,0,127}));
   connect(EHea.y, yEHea) annotation (Line(points={{81,-80},{120,-80}},
         color={0,0,127}));
   connect(port_a, fan.port_a) annotation (Line(points={{-100,0},{-60,0}}, color={0,127,255}));
   connect(hea.port_b, port_b)
     annotation (Line(points={{40,0},{100,0}}, color={0,127,255}));
+  connect(conPID.y, gai.u)
+    annotation (Line(points={{-58,-60},{-50,-60}}, color={0,0,127}));
+  connect(gai.y, addPar.u)
+    annotation (Line(points={{-26,-60},{-22,-60}}, color={0,0,127}));
+
   annotation (
  Icon(coordinateSystem(preserveAspectRatio=false),
  graphics={
diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/AirHeating.mo b/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/AirHeating.mo
index 7e8d7e39132..5c906ae74af 100644
--- a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/AirHeating.mo
+++ b/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/AirHeating.mo
@@ -113,8 +113,7 @@ model AirHeating
     "Set point temperature for air leaving the heater"
     annotation (Placement(transformation(extent={{40,-90},{60,-70}})));
   Controls.OBC.CDL.Continuous.AddParameter TSupMin(
-    p=2,
-    k=1)
+    p=2)
     "Minimum supply air temperature"
     annotation (Placement(transformation(extent={{8,-110},{28,-90}})));
 
diff --git a/Buildings/package.mo b/Buildings/package.mo
index 57e87076737..9b0a09b91ed 100644
--- a/Buildings/package.mo
+++ b/Buildings/package.mo
@@ -268,6 +268,14 @@ to <b style=\"color:blue\">existing</b> libraries:
     </td>
     <td valign=\"top\">Created new blocks based on the discussion from ASHRAE Standard 231P Committee.
                        This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2865\">#2865</a>.<br/>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integers.AddParameter
+    </td>
+    <td valign=\"top\">New block based on the discussion from ASHRAE Standard 231P Committee.
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2876\">#2876</a>.<br/>
+    </td>
+</tr>
 <tr><td colspan=\"2\"><b>Buildings.Fluid.Storage.Ice</b>
     </td>
 </tr>
@@ -544,10 +552,12 @@ have been <b style=\"color:blue\">improved</b> in a
     </td>
 </tr>
 <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Add<br/>
-                       Buildings.Controls.OBC.CDL.Integers.Add
+                       Buildings.Controls.OBC.CDL.Integers.Add<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.AddParameter
     </td>
     <td valign=\"top\">Moved classes to <code>Obsolete</code> package and created new blocks to avoid using input gain factor.
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2865\">#2865</a>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2865\">#2865</a> and
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2876\">#2876</a>.<br/>
                        For Dymola, a conversion script makes this change.
     </td>
 </tr>
diff --git a/bin/verifyFiles.py b/bin/verifyFiles.py
index 135ea584347..5a662b6d78e 100755
--- a/bin/verifyFiles.py
+++ b/bin/verifyFiles.py
@@ -43,7 +43,9 @@
                 "modelica://AixLib",
                 "modelica://BuildingSystems",
 	        "modelica://IDEAS",
-                "modelica://https://"]
+                "modelica://https://",
+                ">>>>>>",
+                "<<<<<<"]
 
 if LIBNAME != "IBPSA":
     INVALID_IN_ALL.append("modelica://IBPSA")
@@ -76,7 +78,7 @@ def report_empty_statements(fileName, start_line, next_line):
     filObj=open(fileName, 'r')
     filTex=filObj.readlines()
     found_loop = False
-    iLin = 1;
+    iLin = 1
     for lin in filTex:
         if lin.rstrip().endswith(start_line):
             found_loop = True