diff --git a/Buildings/Electrical/AC/OnePhase/Storage/Battery.mo b/Buildings/Electrical/AC/OnePhase/Storage/Battery.mo
index 4b39c5f3fdc..00fce81f273 100644
--- a/Buildings/Electrical/AC/OnePhase/Storage/Battery.mo
+++ b/Buildings/Electrical/AC/OnePhase/Storage/Battery.mo
@@ -10,7 +10,7 @@ model Battery "Simple model of a battery"
   parameter Modelica.SIunits.Efficiency etaDis(max=1) = 0.9
     "Efficiency during discharging";
   parameter Real SOC_start(start=0.1) "Initial charge";
-  parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kWh")
+  parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kW.h")
     "Maximum available charge";
   parameter Modelica.SIunits.Voltage V_nominal(start = 110)
     "Nominal voltage (V_nominal >= 0)";
@@ -185,6 +185,12 @@ and that the state of charge remains between zero and one.
         revisions="<html>
 <ul>
 <li>
+December 6, 2021, by Michael Wetter:<br/>
+Corrected wrong unit string.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2798\">issue 2798</a>.
+</li>
+<li>
 April 2, 2020 by Michael Wetter:<br/>
 Corrected model and improved the documentation. The previous model extracted from
 the AC connector the input power <code>P</code> plus the AC/DC conversion losses, but <code>P</code>
diff --git a/Buildings/Electrical/DC/Storage/BaseClasses/Charge.mo b/Buildings/Electrical/DC/Storage/BaseClasses/Charge.mo
index e58d6479f00..f470cb6cbfd 100644
--- a/Buildings/Electrical/DC/Storage/BaseClasses/Charge.mo
+++ b/Buildings/Electrical/DC/Storage/BaseClasses/Charge.mo
@@ -7,7 +7,7 @@ model Charge "Model to compute the battery charge"
     "Efficiency during discharging";
   parameter Real SOC_start(min=0, max=1, unit="1")=0.1
     "Initial state of charge";
-  parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kWh")
+  parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kW.h")
     "Maximum available charge";
   Modelica.SIunits.Power PAct "Actual power";
   Modelica.Blocks.Interfaces.RealInput P(final quantity="Power",
@@ -83,6 +83,12 @@ exceeding the range between 0 and 1.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2021, by Michael Wetter:<br/>
+Corrected wrong unit string.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2798\">issue 2798</a>.
+</li>
+<li>
 June 2, 2014, by Marco Bonvini:<br/>
 Revised documentation.
 </li>
diff --git a/Buildings/Electrical/DC/Storage/Battery.mo b/Buildings/Electrical/DC/Storage/Battery.mo
index 89d4067f1da..03196df9d64 100644
--- a/Buildings/Electrical/DC/Storage/Battery.mo
+++ b/Buildings/Electrical/DC/Storage/Battery.mo
@@ -5,7 +5,7 @@ model Battery "Simple model of a battery"
  parameter Modelica.SIunits.Efficiency etaDis(max=1) = 0.9
     "Efficiency during discharging";
  parameter Real SOC_start(min=0, max=1, unit="1")=0.1 "Initial state of charge";
- parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kWh")
+ parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kW.h")
     "Maximum available charge";
  parameter Modelica.SIunits.Voltage V_nominal
     "Nominal voltage (V_nominal >= 0)";
@@ -150,6 +150,12 @@ and that the state of charge remains between zero and one.
         revisions="<html>
 <ul>
 <li>
+December 6, 2021, by Michael Wetter:<br/>
+Corrected wrong unit string.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2798\">issue 2798</a>.
+</li>
+<li>
 September 24, 2015 by Michael Wetter:<br/>
 Removed binding of <code>P_nominal</code> as
 this parameter is disabled and assigned a value
diff --git a/Buildings/Examples/ChillerPlant/BaseClasses/DataCenter.mo b/Buildings/Examples/ChillerPlant/BaseClasses/DataCenter.mo
index d4ba7e389bd..e7cf6c27c7c 100644
--- a/Buildings/Examples/ChillerPlant/BaseClasses/DataCenter.mo
+++ b/Buildings/Examples/ChillerPlant/BaseClasses/DataCenter.mo
@@ -40,7 +40,7 @@ partial model DataCenter
     m2_flow(start=mAir_flow_nominal),
     dp2_nominal=249*3,
     UA_nominal=mAir_flow_nominal*1006*5,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     dp1_nominal(displayUnit="Pa") = 1000 + 89580)
     "Cooling coil"
     annotation (Placement(transformation(extent={{300,-180},{280,-160}})));
@@ -80,7 +80,7 @@ partial model DataCenter
     TAirInWB_nominal(displayUnit="degC") = 283.15,
     TApp_nominal=6,
     dp_nominal=14930 + 14930 + 74650,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial)
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
     "Cooling tower"                                   annotation (Placement(
         transformation(
         extent={{-10,-10},{10,10}},
@@ -146,7 +146,7 @@ partial model DataCenter
     dp2_nominal=0,
     dp1_nominal=0,
     per=Buildings.Fluid.Chillers.Data.ElectricEIR.ElectricEIRChiller_Carrier_19XR_742kW_5_42COP_VSD(),
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial)
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
     annotation (Placement(transformation(extent={{274,83},{254,103}})));
   Buildings.Fluid.Actuators.Valves.TwoWayLinear val6(
     redeclare package Medium = MediumW,
@@ -602,6 +602,12 @@ Buildings.Examples.ChillerPlant</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2021, by Michael Wetter:<br/>
+Changed initialization from steady-state initial to fixed initial.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2798\">issue 2798</a>.
+</li>
+<li>
 November 18, 2021, by Michael Wetter:<br/>
 Set <code>dp_nominal</code> for pumps and fan to a realistic value.<br/>
 This is for
diff --git a/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Floor.mo b/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Floor.mo
index 7b3affa01a3..3d76100d621 100644
--- a/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Floor.mo
+++ b/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Floor.mo
@@ -202,8 +202,4 @@ equation
     annotation (Line(points={{0,100},{96,100},{96,20},{92,20}},color={191,0,0}));
   connect(thermalZoneTwoElements.TAir,TAir)
     annotation (Line(points={{93,32},{98,32},{98,0},{110,0}},color={0,0,127}));
-  annotation (
-    experiment(
-      StopTime=31536000,
-      Interval=3600));
 end Floor;
diff --git a/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/ICT.mo b/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/ICT.mo
index 5338520a40a..811c55907fb 100644
--- a/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/ICT.mo
+++ b/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/ICT.mo
@@ -202,8 +202,4 @@ equation
     annotation (Line(points={{0,100},{96,100},{96,20},{92,20}},color={191,0,0}));
   connect(thermalZoneTwoElements.TAir,TAir)
     annotation (Line(points={{93,32},{98,32},{98,0},{110,0}},color={0,0,127}));
-  annotation (
-    experiment(
-      StopTime=31536000,
-      Interval=3600));
 end ICT;
diff --git a/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Meeting.mo b/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Meeting.mo
index 296fbceb791..3d28902ae41 100644
--- a/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Meeting.mo
+++ b/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Meeting.mo
@@ -202,8 +202,4 @@ equation
     annotation (Line(points={{0,100},{96,100},{96,20},{92,20}},color={191,0,0}));
   connect(thermalZoneTwoElements.TAir,TAir)
     annotation (Line(points={{93,32},{98,32},{98,0},{110,0}},color={0,0,127}));
-  annotation (
-    experiment(
-      StopTime=31536000,
-      Interval=3600));
 end Meeting;
diff --git a/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Office.mo b/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Office.mo
index 0cdad7b2e4d..1ac434b3b9d 100644
--- a/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Office.mo
+++ b/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Office.mo
@@ -202,8 +202,4 @@ equation
     annotation (Line(points={{0,100},{96,100},{96,20},{92,20}},color={191,0,0}));
   connect(thermalZoneTwoElements.TAir,TAir)
     annotation (Line(points={{93,32},{98,32},{98,0},{110,0}},color={0,0,127}));
-  annotation (
-    experiment(
-      StopTime=31536000,
-      Interval=3600));
 end Office;
diff --git a/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Restroom.mo b/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Restroom.mo
index df28973f855..16295182e74 100644
--- a/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Restroom.mo
+++ b/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Restroom.mo
@@ -202,8 +202,4 @@ equation
     annotation (Line(points={{0,100},{96,100},{96,20},{92,20}},color={191,0,0}));
   connect(thermalZoneTwoElements.TAir,TAir)
     annotation (Line(points={{93,32},{98,32},{98,0},{110,0}},color={0,0,127}));
-  annotation (
-    experiment(
-      StopTime=31536000,
-      Interval=3600));
 end Restroom;
diff --git a/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Storage.mo b/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Storage.mo
index cf1bbd490ed..2c728c82f9c 100644
--- a/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Storage.mo
+++ b/Buildings/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Storage.mo
@@ -202,8 +202,4 @@ equation
     annotation (Line(points={{0,100},{96,100},{96,20},{92,20}},color={191,0,0}));
   connect(thermalZoneTwoElements.TAir,TAir)
     annotation (Line(points={{93,32},{98,32},{98,0},{110,0}},color={0,0,127}));
-  annotation (
-    experiment(
-      StopTime=31536000,
-      Interval=3600));
 end Storage;
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_ChillerPlant_DataCenterContinuousTimeControl.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_ChillerPlant_DataCenterContinuousTimeControl.txt
index 0855021b7f9..62cf772c29f 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_ChillerPlant_DataCenterContinuousTimeControl.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_ChillerPlant_DataCenterContinuousTimeControl.txt
@@ -1,7 +1,8 @@
-last-generated=2021-04-07
+last-generated=2021-12-06
 statistics-initialization=
 {
-  "nonlinear": "1, 2, 1, 1, 17",
+  "linear": "2",
+  "nonlinear": "1, 2, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_ChillerPlant_DataCenterDiscreteTimeControl.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_ChillerPlant_DataCenterDiscreteTimeControl.txt
index 23529d4f955..6f51d892cd9 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_ChillerPlant_DataCenterDiscreteTimeControl.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_ChillerPlant_DataCenterDiscreteTimeControl.txt
@@ -1,7 +1,8 @@
-last-generated=2021-04-07
+last-generated=2021-12-06
 statistics-initialization=
 {
-  "nonlinear": "1, 2, 1, 1, 17",
+  "linear": "2",
+  "nonlinear": "1, 2, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
@@ -12,7 +13,7 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[1.30464e+07, 1.36512e+07]
-TAirSup.T=[2.931499938964844e+02, 3.000118408203125e+02, 3.002850952148438e+02, 2.999788208007812e+02, 3.000184631347656e+02, 3.008482055664062e+02, 2.999417114257812e+02, 3.000575866699219e+02, 3.002469787597656e+02, 2.997608032226562e+02, 3.008482055664062e+02, 2.999416198730469e+02, 3.000575866699219e+02, 3.002467041015625e+02, 2.997608337402344e+02, 3.008482055664062e+02, 2.999416198730469e+02, 3.000575866699219e+02, 3.002467041015625e+02, 2.997608032226562e+02, 3.008482971191406e+02, 2.999417114257812e+02, 3.000575866699219e+02, 3.002469787597656e+02, 2.997608032226562e+02, 3.008482971191406e+02, 2.99941650390625e+02, 3.000576171875e+02, 3.002467041015625e+02, 2.997608337402344e+02, 3.008482360839844e+02, 3.002455444335938e+02, 3.001767883300781e+02, 3.002845458984375e+02, 2.998896179199219e+02, 2.99613037109375e+02, 3.006255187988281e+02, 3.001194763183594e+02, 3.002842102050781e+02, 2.998895874023438e+02, 2.996129760742188e+02, 3.006256103515625e+02, 3.001194763183594e+02, 3.002844543457031e+02, 2.998897094726562e+02, 2.999432678222656e+02, 3.001430358886719e+02, 3.002892456054688e+02, 3.000545959472656e+02, 3.006559753417969e+02, 2.99709228515625e+02, 2.998655395507812e+02, 3.004558410644531e+02, 3.000545959472656e+02, 3.006558532714844e+02, 2.997091674804688e+02, 3.002256774902344e+02, 3.002518920898438e+02, 3.002503967285156e+02, 3.001264953613281e+02, 3.001675109863281e+02, 2.998656005859375e+02, 3.004558715820312e+02, 3.000545959472656e+02, 3.006559448242188e+02, 2.997091979980469e+02, 2.998655700683594e+02, 3.004558410644531e+02, 3.000545959472656e+02, 3.006558532714844e+02, 2.997091674804688e+02, 2.998655090332031e+02, 2.992843017578125e+02, 3.00068603515625e+02, 3.003787231445312e+02, 3.002118225097656e+02, 2.999416198730469e+02, 3.000575866699219e+02, 3.002469482421875e+02, 2.997608032226562e+02, 3.008482971191406e+02, 2.999416809082031e+02, 3.000576171875e+02, 3.002467041015625e+02, 2.997608337402344e+02, 3.001391296386719e+02, 3.000281982421875e+02, 3.003760375976562e+02, 3.00104248046875e+02, 3.001494445800781e+02, 2.997094116210938e+02, 2.99865478515625e+02, 3.004558410644531e+02, 3.000545959472656e+02, 3.006559753417969e+02, 2.99709228515625e+02, 2.99865478515625e+02, 3.004558715820312e+02, 3.002991638183594e+02, 2.9991748046875e+02, 3.003031005859375e+02]
+TAirSup.T=[2.931499938964844e+02, 3.000107727050781e+02, 3.002842102050781e+02, 2.9997802734375e+02, 3.000176391601562e+02, 2.9970849609375e+02, 2.9986474609375e+02, 3.004551391601562e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 2.9986474609375e+02, 3.004551391601562e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 2.9986474609375e+02, 3.004551391601562e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 2.9986474609375e+02, 3.004551391601562e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 2.9986474609375e+02, 3.004551391601562e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 3.002315979003906e+02, 3.001759948730469e+02, 3.0028369140625e+02, 2.998889465332031e+02, 2.996123046875e+02, 3.006250305175781e+02, 3.001188659667969e+02, 3.002835998535156e+02, 2.998889465332031e+02, 2.996123046875e+02, 3.00625e+02, 3.001188659667969e+02, 3.002835693359375e+02, 2.99888916015625e+02, 2.999425354003906e+02, 3.001419677734375e+02, 3.002884521484375e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 2.9986474609375e+02, 3.004551391601562e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 3.002250061035156e+02, 3.002510986328125e+02, 3.002492980957031e+02, 3.001258544921875e+02, 3.001667785644531e+02, 2.998648681640625e+02, 3.004551391601562e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 2.9986474609375e+02, 3.004551391601562e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 2.9986474609375e+02, 2.992835998535156e+02, 3.000678100585938e+02, 3.003779602050781e+02, 3.002110290527344e+02, 2.999408874511719e+02, 3.000569763183594e+02, 3.002462463378906e+02, 2.997601623535156e+02, 3.008475952148438e+02, 2.999408874511719e+02, 3.000569763183594e+02, 3.002462463378906e+02, 2.997601623535156e+02, 3.001383972167969e+02, 3.000271301269531e+02, 3.00375244140625e+02, 3.001034240722656e+02, 3.001484985351562e+02, 2.997086791992188e+02, 2.9986474609375e+02, 3.004551391601562e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 2.9986474609375e+02, 3.004551391601562e+02, 3.002982482910156e+02, 2.999165649414062e+02, 3.0030224609375e+02]
 wseCon.TWetBul=[2.844858093261719e+02, 2.834715576171875e+02, 2.830081176757812e+02, 2.828131103515625e+02, 2.849400634765625e+02, 2.8767724609375e+02, 2.8843408203125e+02, 2.897018127441406e+02, 2.908985595703125e+02, 2.890965576171875e+02, 2.873750610351562e+02, 2.870310668945312e+02, 2.850565490722656e+02, 2.844025268554688e+02, 2.846215209960938e+02, 2.85584716796875e+02, 2.844925842285156e+02, 2.850927429199219e+02, 2.872787780761719e+02, 2.895964050292969e+02, 2.900821838378906e+02, 2.907142028808594e+02, 2.902919311523438e+02, 2.930731811523438e+02, 2.90821044921875e+02, 2.897002868652344e+02, 2.878292541503906e+02, 2.864308776855469e+02, 2.858257446289062e+02, 2.848772583007812e+02, 2.845028381347656e+02, 2.841003723144531e+02, 2.848956604003906e+02, 2.86788330078125e+02, 2.895969543457031e+02, 2.904920654296875e+02, 2.898047180175781e+02, 2.892393188476562e+02, 2.886691284179688e+02, 2.876924133300781e+02, 2.86109130859375e+02, 2.854310913085938e+02, 2.85067138671875e+02, 2.846211547851562e+02, 2.8425341796875e+02, 2.839706420898438e+02, 2.83714111328125e+02, 2.850740661621094e+02, 2.861065368652344e+02, 2.872113342285156e+02, 2.876419067382812e+02, 2.873104553222656e+02, 2.873970031738281e+02, 2.86239013671875e+02, 2.8519189453125e+02, 2.844321594238281e+02, 2.840808715820312e+02, 2.840713806152344e+02, 2.836410827636719e+02, 2.833737182617188e+02, 2.843021850585938e+02, 2.866591186523438e+02, 2.888963012695312e+02, 2.899041748046875e+02, 2.917620544433594e+02, 2.920389709472656e+02, 2.900023498535156e+02, 2.879818725585938e+02, 2.860729370117188e+02, 2.851282043457031e+02, 2.844984436035156e+02, 2.84646240234375e+02, 2.840837097167969e+02, 2.839063415527344e+02, 2.838663330078125e+02, 2.845386047363281e+02, 2.870115661621094e+02, 2.886986083984375e+02, 2.89677734375e+02, 2.908424682617188e+02, 2.89357666015625e+02, 2.880846862792969e+02, 2.865106201171875e+02, 2.850302429199219e+02, 2.841634216308594e+02, 2.842227783203125e+02, 2.844867553710938e+02, 2.843226013183594e+02, 2.840713806152344e+02, 2.842268371582031e+02, 2.857822875976562e+02, 2.865521240234375e+02, 2.869639282226562e+02, 2.870909118652344e+02, 2.867579345703125e+02, 2.865088195800781e+02, 2.860401611328125e+02, 2.847579345703125e+02, 2.838851928710938e+02, 2.837900695800781e+02, 2.835923156738281e+02]
 wseCon.y1=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 chiCon.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 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, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_ChillerPlant_DataCenterRenewables.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_ChillerPlant_DataCenterRenewables.txt
index 2e91074beaf..81333f50487 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_ChillerPlant_DataCenterRenewables.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_ChillerPlant_DataCenterRenewables.txt
@@ -1,7 +1,8 @@
-last-generated=2021-04-07
+last-generated=2021-12-06
 statistics-initialization=
 {
-  "nonlinear": "1, 2, 1, 1, 17",
+  "linear": "2",
+  "nonlinear": "1, 2, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
@@ -15,5 +16,5 @@ time=[0e+00, 6.048e+05]
 winTur.vWin=[0e+00, 1.596567511558533e+00, 1.895051121711731e+00, 3.092883586883545e+00, 3.109243810176849e-01, 0e+00, 2.726400084793568e-02, 1.5e+00, 9.939464330673218e-01, 2.037714868783951e-01, 3.268851041793823e+00, 1.391083598136902e+00, 2.099999904632568e+00, 2.099999904632568e+00, 2.030853748321539e+00, 1.729037880897522e+00, 0e+00, 6.67519986629494e-01, 3.402022123336792e+00, 5.590994834899902e+00, 5.68682336807251e+00, 3.536049604415894e+00, 1.235832367092371e-02, 1.976735949516296e+00, 3.420000076293945e+00, 0e+00, 1.102998852729797e+00, 9.461759924888611e-01, 0e+00, 1.798617601394653e+00, 3.991854429244995e+00, 8.535819053649902e+00, 1.048734664916992e+01, 9.666060447692871e+00, 3.757381916046123e+00, 4.036571502685547e+00, 2.356527328491211e+00, 1.047459840774536e-01, 2.066086053848267e+00, 1.128999471664429e+00, 1.245499134063721e+00, 1.979716897010781e+00, 1.426740527153015e+00, 4.160890102386475e+00, 0e+00, 9.710806012153625e-01, 1.140192031860352e+00, 0e+00, 3.306962490081787e+00, 3.779999971389771e+00, 2.099999904632568e+00, 3.44635397195816e-01, 2.487114429473877e+00, 0e+00, 0e+00, 4.670769274234772e-01, 1.568213701248187e+00, 3.073129177093498e+00, 2.069003582000732e+00, 1.004611793905497e-02, 2.152941226959229e-01, 9.954575896263123e-01, 4.19812536239624e+00, 3.54094934463501e+00, 3.599999904632568e+00, 1.98800003528595e+00, 3.606459379196167e+00, 8.766912221908569e-01, 1.218539237976044e+00, 0e+00, 1.850905299186707e+00, 3.191929578781128e+00, 2.602028846740723e+00, 3.599999904632568e+00, 3.528584241867065e+00, 5.173639294753229e-13, 2.236452579498291e+00, 2.909302949905396e+00, 3.067941665649414e+00, 3.233940303325653e-01, 2.016434192657471e+00, 1.48234975337982e+00, 2.008835792541492e+00, 8.642631769180298e-01, 2.078947067260742e+00, 5.176911354064941e+00, 4.164128303527832e+00, 1.5e+00, 1.5e+00, 2.120252132415771e+00, 5.815384536981583e-02, 2.041052103042603e+00, 4.06989049911499e+00, 5.144943237304688e+00, 3.057475566864014e+00, 3.528000116348267e+00, 2.870009660720825e+00, 4.118892669677734e+00, 3.279999971389771e+00, 4.050852954387665e-01, 0e+00]
 winTur.P=[0e+00, 0e+00, 1.075216064453125e+03, 2.9545349609375e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.7791046875e+04, 0e+00, 4.97673291015625e+03, 4.97673291015625e+03, 3.660428710937609e+03, 0e+00, 0e+00, 0e+00, 4.403133203125e+04, 1.46604796875e+05, 1.51095234375e+05, 5.031174609375e+04, 0e+00, 2.630212646484375e+03, 4.48737578125e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.1670390625e+04, 2e+05, 2e+05, 2e+05, 6.068320312499906e+04, 7.37657890625e+04, 9.860125e+03, 0e+00, 4.3311279296875e+03, 0e+00, 0e+00, 2.68695971679681e+03, 0e+00, 7.95912578125e+04, 0e+00, 0e+00, 0e+00, 0e+00, 3.957691796875e+04, 6.17430625e+04, 4.97673291015625e+03, 0e+00, 1.234605078125e+04, 0e+00, 0e+00, 0e+00, 9.169382275651078e-11, 2.861968164062465e+04, 4.38666845703125e+03, 0e+00, 0e+00, 0e+00, 8.13360625e+04, 5.054134375e+04, 5.330841015625e+04, 2.844640380859375e+03, 5.361109375e+04, 0e+00, 0e+00, 0e+00, 2.348309478759766e+02, 3.41865703125e+04, 1.45336240234375e+04, 5.330841015625e+04, 4.99619296875e+04, 0e+00, 7.5743173828125e+03, 2.0942912109375e+04, 2.837659375e+04, 0e+00, 3.3859306640625e+03, 0e+00, 3.241280517577969e+03, 0e+00, 4.57595751953125e+03, 1.272011796875e+05, 7.9742984375e+04, 0e+00, 0e+00, 5.362263671875e+03, 0e+00, 3.85456982421875e+03, 7.5327078125e+04, 1.257031796875e+05, 2.78861640625e+04, 4.993455078125e+04, 1.963505078125e+04, 7.7623296875e+04, 3.83134765625e+04, 0e+00, 0e+00]
 pv.P=[0e+00, 0e+00, 0e+00, 0e+00, 1.207135162353516e+02, 5.9075375e+04, 1.292099296875e+05, 1.24213625e+05, 1.05285609375e+05, 6.024068359375e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.157878515625e+04, 1.08651421875e+05, 1.35284546875e+05, 1.161695546875e+05, 7.195034375e+04, 1.968509887695312e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.46096337890625e+03, 7.514991406250031e+04, 1.16560890625e+05, 1.168965078125e+05, 7.77755390625e+04, 2.115083984375e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.522792358398438e+02, 3.996225390625e+04, 6.03939921875e+04, 1.0753153125e+05, 9.72341796875e+04, 3.684495703125e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.7130876953125e+04, 8.1818734375e+04, 1.32969421875e+05, 1.3160525e+05, 7.21634453125e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.6062548828125e+03, 9.11464375e+04, 7.24068671875e+04, 1.20986875e+05, 8.3585140625e+04, 1.29491494140619e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.54644375e+04, 5.225646875e+04, 3.78922109375e+04, 7.15370859375e+04, 4.388613671875e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-gri.P.real=[-4.87148359375e+04, 6.5156875e+04, -2.9371142578125e+04, -1.37122828125e+05, -1.8633040625e+05, -3.1520940625e+05, -9.91006625e+05, -9.866265625e+05, -9.6977375e+05, -5.691669375e+05, -5.4891725e+05, -5.1467840625e+05, -3.39088875e+05, -3.3896575e+05, -3.377235937500001e+05, -3.3462815625e+05, -3.3432878125e+05, -3.3426215625e+05, -5.54076625e+05, -1.02579725e+06, -1.108409e+06, -1.0418175e+06, -6.19466625e+05, -5.822069375e+05, -5.57129875e+05, -5.1486434375e+05, -3.346765e+05, -3.3472803125e+05, -3.347085e+05, -3.346773125e+05, -3.9914359375e+05, -5.1473003125e+05, -5.14713875e+05, -1.058623875e+06, -9.968476874999994e+05, -1.046045125e+06, -6.289225625e+05, -5.848031875e+05, -5.37772875e+05, -5.1466959375e+05, -3.34576375e+05, -3.369087812499999e+05, -3.34765875e+05, -4.0633615625e+05, -3.34597e+05, -3.3453225e+05, -3.342801875e+05, -5.1501109375e+05, -9.461143125e+05, -9.84521875e+05, -6.159279375e+05, -6.02281e+05, -5.591199375e+05, -5.1490696875e+05, -5.1476753125e+05, -3.34714625e+05, -3.347110937500001e+05, -3.604012499999997e+05, -3.3854078125e+05, -3.3430846875e+05, -3.3428703125e+05, -5.1431925e+05, -9.72123625e+05, -9.9367325e+05, -6.822451875e+05, -6.35651e+05, -6.28194e+05, -5.14869375e+05, -5.147363125e+05, -3.3460725e+05, -3.347878125e+05, -3.653183125e+05, -3.4757028125e+05, -3.8243703125e+05, -3.794198125e+05, -5.143748125e+05, -8.897895625e+05, -9.75238125e+05, -9.65083625e+05, -6.232810625e+05, -5.92738625e+05, -5.261513124999994e+05, -5.174688124999999e+05, -3.3454009375e+05, -3.3853703125e+05, -4.493453125e+05, -4.0657078125e+05, -3.34780375e+05, -3.3448990625e+05, -3.3943784375e+05, -8.746835625e+05, -8.9213975e+05, -9.895464375e+05, -6.618874375e+05, -6.0419175e+05, -5.992811875e+05, -5.323715e+05, -5.8445675e+05, -3.6901609375e+05, -3.3451165625e+05, -3.34429625e+05]
-gri.P.cosPhi=[-8.00000011920929e-01, 8.063029050827026e-01, -5.235331654548645e-01, -9.442741274833679e-01, -9.685521125793457e-01, -9.885886907577515e-01, -9.988027215003967e-01, -9.987877011299133e-01, -9.987382292747498e-01, -9.963575005531311e-01, -9.96090829372406e-01, -9.955877661705017e-01, -9.899429082870483e-01, -9.899734854698181e-01, -9.899184107780457e-01, -9.896714091300964e-01, -9.897473454475403e-01, -9.897642135620117e-01, -9.96216356754303e-01, -9.988922476768494e-01, -9.990449547767639e-01, -9.98914361000061e-01, -9.969258308410645e-01, -9.965037107467651e-01, -9.961968064308167e-01, -9.955657124519348e-01, -9.896591305732727e-01, -9.896460175514221e-01, -9.896509647369385e-01, -9.896588921546936e-01, -9.927042722702026e-01, -9.955816268920898e-01, -9.955835938453674e-01, -9.989540576934814e-01, -9.988210201263428e-01, -9.989240765571594e-01, -9.970238208770752e-01, -9.965640306472778e-01, -9.959363341331482e-01, -9.955888390541077e-01, -9.89684522151947e-01, -9.898513555526733e-01, -9.896364212036133e-01, -9.929438233375549e-01, -9.896792769432068e-01, -9.896957278251648e-01, -9.897596836090088e-01, -9.956399202346802e-01, -9.986942410469055e-01, -9.987913370132446e-01, -9.96913731098175e-01, -9.967630505561829e-01, -9.962379932403564e-01, -9.955606460571289e-01, -9.955772161483765e-01, -9.896494150161743e-01, -9.896503090858459e-01, -9.910725951194763e-01, -9.899160861968994e-01, -9.89752471446991e-01, -9.897579550743103e-01, -9.956302642822266e-01, -9.987640380859375e-01, -9.988152980804443e-01, -9.97488260269165e-01, -9.971036314964294e-01, -9.970026612281799e-01, -9.955651164054871e-01, -9.955809116363525e-01, -9.896767139434814e-01, -9.896973371505737e-01, -9.913329482078552e-01, -9.904558062553406e-01, -9.921045303344727e-01, -9.919812679290771e-01, -9.956237077713013e-01, -9.985332489013672e-01, -9.98777449131012e-01, -9.987508058547974e-01, -9.970115423202515e-01, -9.966898560523987e-01, -9.958003759384155e-01, -9.9565190076828e-01, -9.896937608718872e-01, -9.899693131446838e-01, -9.941903948783875e-01, -9.929307699203491e-01, -9.896327257156372e-01, -9.897064566612244e-01, -9.89962637424469e-01, -9.984654784202576e-01, -9.98521625995636e-01, -9.987990260124207e-01, -9.973273873329163e-01, -9.96789276599884e-01, -9.96723473072052e-01, -9.958716630935669e-01, -9.9658203125e-01, -9.915078282356262e-01, -9.89700973033905e-01, -9.897217750549316e-01]
+gri.P.real=[-6.265630859375e+03, 6.517163671875e+04, -2.9356380859375e+04, -1.371080625e+05, -1.8631559375e+05, -3.151945625e+05, -9.90991625e+05, -9.866115625e+05, -9.6975875e+05, -5.69152e+05, -5.4890225e+05, -5.1466346875e+05, -3.390739375e+05, -3.3895084375e+05, -3.377087187500001e+05, -3.3461325e+05, -3.3431390625e+05, -3.342473125e+05, -5.5406175e+05, -1.025782375e+06, -1.108394125e+06, -1.0418025625e+06, -6.19451625e+05, -5.82191875e+05, -5.57114875e+05, -5.1484934375e+05, -3.346615625e+05, -3.3471309375e+05, -3.3469353125e+05, -3.34662375e+05, -3.9912865625e+05, -5.1471509375e+05, -5.146989375e+05, -1.058609e+06, -9.968327499999994e+05, -1.0460301875e+06, -6.289075625e+05, -5.8478825e+05, -5.377579375e+05, -5.1465465625e+05, -3.345614375e+05, -3.368938749999999e+05, -3.347509375e+05, -4.0632121875e+05, -3.3458209375e+05, -3.345173125e+05, -3.342653125e+05, -5.1499621875e+05, -9.460994375e+05, -9.84507e+05, -6.15913e+05, -6.022660625e+05, -5.59105e+05, -5.1489196875e+05, -5.147525625e+05, -3.346996875e+05, -3.346961250000001e+05, -3.603863124999997e+05, -3.3852584375e+05, -3.34293625e+05, -3.3427215625e+05, -5.14304375e+05, -9.721086875e+05, -9.93658375e+05, -6.8223025e+05, -6.356360625e+05, -6.28179e+05, -5.14854375e+05, -5.14721375e+05, -3.3459234375e+05, -3.34772875e+05, -3.6530340625e+05, -3.47555375e+05, -3.8242215625e+05, -3.7940490625e+05, -5.143599375e+05, -8.897746875e+05, -9.7522325e+05, -9.6506875e+05, -6.232661875e+05, -5.9272375e+05, -5.261363749999994e+05, -5.174539062499999e+05, -3.345251875e+05, -3.3852215625e+05, -4.4933034375e+05, -4.065558125e+05, -3.347654375e+05, -3.34475e+05, -3.394229375e+05, -8.74668625e+05, -8.921248125e+05, -9.895315e+05, -6.618725e+05, -6.0417675e+05, -5.992661875e+05, -5.323565625e+05, -5.844418125e+05, -3.690011875e+05, -3.3449675e+05, -3.3441471875e+05]
+gri.P.cosPhi=[-8.00000011920929e-01, 8.064321279525757e-01, -5.234301686286926e-01, -9.442868232727051e-01, -9.685612320899963e-01, -9.885928630828857e-01, -9.988031983375549e-01, -9.987882375717163e-01, -9.987387657165527e-01, -9.963589906692505e-01, -9.960923790931702e-01, -9.95589554309845e-01, -9.899466037750244e-01, -9.899771809577942e-01, -9.899221062660217e-01, -9.896751642227173e-01, -9.897511005401611e-01, -9.897679686546326e-01, -9.962179064750671e-01, -9.988927245140076e-01, -9.990453720092773e-01, -9.989147782325745e-01, -9.969270825386047e-01, -9.965051412582397e-01, -9.961983561515808e-01, -9.955675005912781e-01, -9.896628856658936e-01, -9.896498322486877e-01, -9.896547794342041e-01, -9.896627068519592e-01, -9.927070736885071e-01, -9.955834150314331e-01, -9.955853223800659e-01, -9.989544749259949e-01, -9.988215565681458e-01, -9.989245533943176e-01, -9.970250129699707e-01, -9.965654015541077e-01, -9.959380030632019e-01, -9.955905675888062e-01, -9.896883368492126e-01, -9.898550510406494e-01, -9.896402359008789e-01, -9.929465651512146e-01, -9.896830916404724e-01, -9.896995425224304e-01, -9.897634387016296e-01, -9.956417083740234e-01, -9.986947774887085e-01, -9.987918734550476e-01, -9.969150424003601e-01, -9.967644214630127e-01, -9.962395429611206e-01, -9.955624341964722e-01, -9.955790042877197e-01, -9.896532297134399e-01, -9.896541237831116e-01, -9.910759329795837e-01, -9.899197816848755e-01, -9.897562861442566e-01, -9.897617101669312e-01, -9.95631992816925e-01, -9.987645745277405e-01, -9.988157749176025e-01, -9.97489333152771e-01, -9.971048831939697e-01, -9.970039129257202e-01, -9.955669045448303e-01, -9.955826997756958e-01, -9.896804690361023e-01, -9.897010922431946e-01, -9.913361668586731e-01, -9.904593229293823e-01, -9.921075105667114e-01, -9.919843077659607e-01, -9.956254363059998e-01, -9.985339045524597e-01, -9.987779259681702e-01, -9.987513422966003e-01, -9.97012734413147e-01, -9.966911673545837e-01, -9.95802104473114e-01, -9.956536293029785e-01, -9.896975159645081e-01, -9.899730086326599e-01, -9.941926598548889e-01, -9.92933452129364e-01, -9.896365404129028e-01, -9.8971027135849e-01, -9.899663329124451e-01, -9.984661340713501e-01, -9.985222816467285e-01, -9.987995624542236e-01, -9.973284602165222e-01, -9.967905879020691e-01, -9.967248439788818e-01, -9.958733320236206e-01, -9.965834617614746e-01, -9.915110468864441e-01, -9.897047281265259e-01, -9.897255301475525e-01]
diff --git a/Buildings/package.mo b/Buildings/package.mo
index 0190fe602bb..1733f581d94 100644
--- a/Buildings/package.mo
+++ b/Buildings/package.mo
@@ -349,7 +349,9 @@ Each class (i.e., model, block and function) must be used in an example or valid
     <tr><td valign=\"top\">Buildings.Examples.ChillerPlant.BaseClasses.DataCenter
         </td>
         <td valign=\"top\">Set <code>nominalValuesDefaultPressureCurve=true</code> to avoid warnings.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2761\">Buildings, issue #2761</a>.
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2761\">Buildings, issue #2761</a>.<br/>
+                           Changed initialization from steady state initial to fixed initial for some components.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2798\">Buildings, issue #2798</a>.
         </td>
     </tr>
     <tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
@@ -436,6 +438,17 @@ Each class (i.e., model, block and function) must be used in an example or valid
                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2706\">Buildings, issue 2706</a>.
        </td>
     </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Electrical.AC.OnePhase.Storage.Battery<br/>
+                           Buildings.Electrical.DC.Storage.BaseClasses.Charge<br/>
+                           Buildings.Electrical.DC.Storage.Battery
+        </td>
+        <td valign=\"top\">Corrected unit string.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2798\">Buildings, issue #2798</a>.
+        </td>
+    </tr>
     <tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed</b>
         </td>
     </tr>
