diff --git a/PROMS/Formats/fmtall/WCN1all.xml b/PROMS/Formats/fmtall/WCN1all.xml
index d5a58154..1cd01cb1 100644
Binary files a/PROMS/Formats/fmtall/WCN1all.xml and b/PROMS/Formats/fmtall/WCN1all.xml differ
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs
index dc5e94ba..332bf342 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs
@@ -823,6 +823,14 @@ namespace VEPROMS.CSLA.Library
 		}
 		#endregion
 		#region Message
+		private LazyLoad<bool> _RemoveBullet;
+		public bool RemoveBullet   // C2021-024: WCN1 if bullet exists in combined tab, stop right before bullet.
+		{
+			get
+			{
+				return LazyLoad(ref _RemoveBullet, "@RemoveBullet");
+			}
+		}
 		private LazyLoad<string> _Message;
 		[Category("Continue Msg")]
 		[DisplayName("Top Continue Msg")]
@@ -921,6 +929,14 @@ namespace VEPROMS.CSLA.Library
 		}
 		#endregion
 		#region Message
+		private LazyLoad<bool> _RemoveBullet;
+		public bool RemoveBullet   // C2021-024: WCN1 if bullet exists in combined tab, stop right before bullet.
+		{
+			get
+			{
+				return LazyLoad(ref _RemoveBullet, "@RemoveBullet");
+			}
+		}
 		private LazyLoad<string> _Message;
 		[Category("Continue Msg")]
 		[DisplayName("Bottom Continue Msg")]
diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index 350fdaa8..451fd820 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -2727,10 +2727,15 @@ namespace Volian.Print.Library
 					else
 					{
 						// F2020-023: tab includes parent tab and if caution/note don't use its parent, go up another level
-						if (MyItemInfo.IsCautionOrNotePart)
-							myMsg = myMsg.Replace(@"%s", MyItemInfo.MyParent.MyParent.CombinedTab);
-						else
-							myMsg = myMsg.Replace(@"%s", MyItemInfo.MyParent.CombinedTab);
+						string noBullet = MyItemInfo.IsCautionOrNotePart ? MyItemInfo.MyParent.MyParent.CombinedTab : MyItemInfo.MyParent.CombinedTab;
+						// C2021-024: WCN1 if bullet exists in combined tab, stop right before bullet.
+						if (docstyle.Continue.Top.RemoveBullet)
+						{
+							int ind = noBullet.IndexOf(".o");
+							if (ind < 0) ind = noBullet.IndexOf(".*");
+							if (ind > -1) noBullet = noBullet.Substring(0, ind);
+						}
+						myMsg = myMsg.Replace(@"%s", noBullet);
 					}
 				}
 				if (myMsg.IndexOf(@"%3d") > -1)
@@ -3034,10 +3039,14 @@ namespace Volian.Print.Library
 				string tmp = tb.Trim();
 				if (!MyItemInfo.MyParent.IsHigh)
 				{
-					if (MyItemInfo.IsCautionOrNotePart)
-						tmp = MyItemInfo.MyParent.MyParent.CombinedTab.Trim();
-					else
-						tmp = MyItemInfo.MyParent.CombinedTab.Trim();
+					tmp = MyItemInfo.IsCautionOrNotePart ? MyItemInfo.MyParent.MyParent.CombinedTab : MyItemInfo.MyParent.CombinedTab;
+					// C2021-024: WCN1 if bullet exists in combined tab, stop right before bullet.
+					if (MyItemInfo.MyDocStyle.Continue.Top.RemoveBullet)
+					{
+						int ind = tmp.IndexOf(".o");
+						if (ind < 0) ind = tmp.IndexOf(".*");
+						if (ind > -1) tmp = tmp.Substring(0, ind);
+					}
 				}
 				myMsg = myMsg.Replace(@"%s", tmp);
 			}