diff --git a/PROMS/Formats/fmtall/BGEOIall.xml b/PROMS/Formats/fmtall/BGEOIall.xml
index 25a9c014..ed699d05 100644
Binary files a/PROMS/Formats/fmtall/BGEOIall.xml and b/PROMS/Formats/fmtall/BGEOIall.xml differ
diff --git a/PROMS/Formats/fmtall/BGESTPall.xml b/PROMS/Formats/fmtall/BGESTPall.xml
index 6fb9c262..ef860c71 100644
Binary files a/PROMS/Formats/fmtall/BGESTPall.xml and b/PROMS/Formats/fmtall/BGESTPall.xml differ
diff --git a/PROMS/Formats/fmtall/GENall.xml b/PROMS/Formats/fmtall/GENall.xml
index 92e8e74e..432f0ac3 100644
Binary files a/PROMS/Formats/fmtall/GENall.xml and b/PROMS/Formats/fmtall/GENall.xml differ
diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml
index da5cca77..dd2ccec3 100644
Binary files a/PROMS/Formats/fmtall/VEGP2all.xml and b/PROMS/Formats/fmtall/VEGP2all.xml differ
diff --git a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs
index 66391440..9c0d359f 100644
--- a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs	
+++ b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs	
@@ -44,8 +44,11 @@ using System.Runtime.InteropServices;
 //      Revision DHH (day - no leading zero, two digit hour - military time
 //
 // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
-[assembly: AssemblyVersion("2.1.2403.2209")]
-[assembly: AssemblyFileVersion("2.1.2403.2209")]
+[assembly: AssemblyVersion("2.1.2404.509")]
+[assembly: AssemblyFileVersion("2.1.2404.509")]
+
+
+
 
 
 
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
index 2c145421..e1634696 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -4452,9 +4452,10 @@ namespace VEPROMS.CSLA.Library
 					}
 				}
 				// F2024-037 reset the seq sub-step numbering if the parent is an un-numbered high level step
-				else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0)
+				// F2024-049 changed to specify the level via the format file (Generic EOP and Vogtle 3&4)
+				else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS != null && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0)
 				{
-					localPrintLevel--; // since parent is a high level step we only need to go back one level
+					localPrintLevel = (int)sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS;
 					itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex;
 				}
 				if (!tbformat.Contains(@"{!C"))
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index 653c3df8..faf65a31 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -4508,8 +4508,9 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _AllowNoteCautionAdd, "@AllowNoteCautionAdd");
 			}
 		}
-		private LazyLoad<bool> _ResetSeqNumberingAfterUnnumberedHLS;
-		public bool ResetSeqNumberingAfterUnnumberedHLS
+		// F2024-049 changed to specify the sub-step level via the format file (Generic EOP and Vogtle 3&4)
+		private LazyLoad<int?> _ResetSeqNumberingAfterUnnumberedHLS;
+		public int? ResetSeqNumberingAfterUnnumberedHLS
 		{
 			get
 			{
diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs
index 61b32bc1..82f950c3 100644
--- a/PROMS/Volian.Print.Library/PromsPrinter.cs
+++ b/PROMS/Volian.Print.Library/PromsPrinter.cs
@@ -701,22 +701,24 @@ namespace Volian.Print.Library
 				{
 					if (File.Exists(outputFileName))
 					{
-						String tmpExt = System.IO.Path.GetExtension(outputFileName);
-						String tmpPTH = System.IO.Path.GetDirectoryName(outputFileName);
-						String tmpFN = System.IO.Path.GetFileName(outputFileName);
-						String tmpFNNoExt = System.IO.Path.GetFileNameWithoutExtension(outputFileName);
-
-						var files = new HashSet<string>(Directory.GetFiles(tmpPTH, "*.pdf"));
-						//string baseName = Path.Combine(scpath, "Screenshot_");
-						string filename;
-						int i = 0;
-						do
+						if (!BaselineTesting)
 						{
-							filename = tmpPTH + @"\" + tmpFNNoExt + "_" + ++i + ".pdf";
-						} while (files.Contains(filename));
+							String tmpExt = System.IO.Path.GetExtension(outputFileName);
+							String tmpPTH = System.IO.Path.GetDirectoryName(outputFileName);
+							String tmpFN = System.IO.Path.GetFileName(outputFileName);
+							String tmpFNNoExt = System.IO.Path.GetFileNameWithoutExtension(outputFileName);
 
-						outputFileName = filename;
+							var files = new HashSet<string>(Directory.GetFiles(tmpPTH, "*.pdf"));
+							//string baseName = Path.Combine(scpath, "Screenshot_");
+							string filename;
+							int i = 0;
+							do
+							{
+								filename = tmpPTH + @"\" + tmpFNNoExt + "_" + ++i + ".pdf";
+							} while (files.Contains(filename));
 
+							outputFileName = filename;
+						}
 					}
 
 					writer = PdfWriter.GetInstance(document, new FileStream(outputFileName, FileMode.Create));