diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/CalendarTime.mo b/Buildings/Controls/OBC/CDL/Continuous/Sources/CalendarTime.mo
index e49242612a3..adae91da1cb 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Sources/CalendarTime.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/Sources/CalendarTime.mo
@@ -38,7 +38,7 @@ model CalendarTime
 protected
   final constant Integer firstYear=2010
     "First year that is supported, i.e. the first year in timeStampsNewYear[:]";
-  final constant Integer lastYear=firstYear+11
+  final constant Integer lastYear=firstYear+21
     "Last year that is supported (actual building automation system need to support a larger range)";
   Buildings.Utilities.Time.CalendarTime calTim(
     final zerTim=zerTim,
@@ -92,6 +92,11 @@ This is within the 2010-2020 range and is therefore allowed.
       revisions="<html>
 <ul>
 <li>
+March 30, 2022, by Michael Wetter:<br/>
+Increased value of <code>lastYear</code> as the underlying implementation allows
+for 21 years.
+</li>
+<li>
 November 12, 2020, by Michael Wetter:<br/>
 Reformulated to remove dependency to <code>Modelica.Units.SI</code>.<br/>
 This is for
diff --git a/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo b/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo
index 02f176d5e5f..d53a67f2456 100644
--- a/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo
+++ b/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo
@@ -85,25 +85,6 @@ equation
         preserveAspectRatio=true,
         extent={{-100,-100},{100,100}}),
       graphics={
-        Ellipse(
-          extent={{-25,-10},{-45,10}},
-          lineColor={0,0,255},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{45,-10},{25,10}},
-          lineColor={0,0,255},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Line(
-          points={{-100,0},{-45,0}},
-          color={0,0,255}),
-        Line(
-          points={{45,0},{100,0}},
-          color={0,0,255}),
-        Line(
-          points={{-35,0},{30,35}},
-          color={0,0,255}),
         Text(
           extent={{226,60},{106,10}},
           textColor={0,0,0},
@@ -120,6 +101,10 @@ via parameter <code>samplePeriod</code>.
       revisions="<html>
 <ul>
 <li>
+March 30, 2022, by Michael Wetter:<br/>
+Removed graphic from diagram view.
+</li>
+<li>
 November 12, 2020, by Michael Wetter:<br/>
 Reformulated to remove dependency to <code>Modelica.Units.SI</code>.<br/>
 This is for
diff --git a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMax.mo b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMax.mo
index a751322630c..63094e0fa9d 100644
--- a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMax.mo
+++ b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMax.mo
@@ -68,28 +68,6 @@ equation
         preserveAspectRatio=true,
         extent={{-100,-100},{100,100}}),
       graphics={
-        Ellipse(
-          extent={{-25,-10},{-45,10}},
-          lineColor={0,0,255},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{45,-10},{25,10}},
-          lineColor={0,0,255},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Line(
-          points={{-100,0},{-45,0}},
-          color={0,0,255}),
-        Line(
-          points={{45,0},{100,0}},
-          color={0,0,255}),
-        Line(
-          points={{-35,0},{28,-48}},
-          color={0,0,255}),
-        Line(
-          points={{0,-100},{0,-26}},
-          color={255,0,255}),
         Text(
           extent={{226,60},{106,10}},
           textColor={0,0,0},
@@ -108,6 +86,10 @@ at the sampling point is provided as the output signal.
       revisions="<html>
 <ul>
 <li>
+March 30, 2022, by Michael Wetter:<br/>
+Removed graphic from diagram view.
+</li>
+<li>
 March 2, 2020, by Michael Wetter:<br/>
 Changed icon to display dynamically the output value.
 </li>
diff --git a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo
index 0708382384f..f8d378af6ae 100644
--- a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo
+++ b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo
@@ -27,7 +27,7 @@ protected
     start=0,
     fixed=true)
     "Index of the vector ySample";
-  Real ySample[n](
+  discrete Real ySample[n](
     start=zeros(n),
     each fixed=true)
     "Vector of samples to be averaged";
@@ -174,6 +174,12 @@ and produces this value at its output <code>y</code>.
       revisions="<html>
 <ul>
 <li>
+March 30, 2022, by Michael Wetter:<br/>
+Added <code>discrete</code> keyword to sampled variable.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2942\">issue 2942</a>.
+</li>
+<li>
 October 19, 2020, by Michael Wetter:<br/>
 Removed non-needed protected parameter <code>t0</code>.
 </li>
diff --git a/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo b/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo
index 2107d61a79e..ec418d4b4c8 100644
--- a/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo
+++ b/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo
@@ -50,8 +50,8 @@ equation
   /* Define y=ySample with an infinitesimal delay to break potential
        algebraic loops if both the continuous and the discrete part have
        direct feedthrough
-    */
-      y=pre(ySample);
+   */
+  y=pre(ySample);
   annotation (
     defaultComponentName="zerOrdHol",
     Icon(
diff --git a/Buildings/package.mo b/Buildings/package.mo
index 5075235d6b5..d82cf2753c0 100644
--- a/Buildings/package.mo
+++ b/Buildings/package.mo
@@ -362,7 +362,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1534\">IBPSA, #1534</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC</b>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE</b>
     </td>
 </tr>
 <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.GroupStatus
@@ -371,7 +371,24 @@ have been <b style=\"color:blue\">improved</b> in a
                        This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2544\"># 2544</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.Utilities.SunRiseSet
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Sources.CalendarTime
+    </td>
+    <td valign=\"top\">Increased number of years that block will output the calendar time.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2942\">issue 2942</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Discrete.TriggeredMovingMean<br/>
+    </td>
+    <td valign=\"top\">Added missing <code>discrete</code> keyword to sampled variable.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2942\">issue 2942</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Utilities.SunRiseSet
     </td>
     <td valign=\"top\">Changed implementation to avoid NaN in OpenModelica.<br/>
                        This is for
