diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml
index c951249b..69090c69 100644
Binary files a/PROMS/Formats/fmtall/BNPP1all.xml and b/PROMS/Formats/fmtall/BNPP1all.xml differ
diff --git a/PROMS/Formats/fmtall/BNPP2all.xml b/PROMS/Formats/fmtall/BNPP2all.xml
index 04305cc4..ebdd33f3 100644
Binary files a/PROMS/Formats/fmtall/BNPP2all.xml and b/PROMS/Formats/fmtall/BNPP2all.xml differ
diff --git a/PROMS/Formats/fmtall/BNPPalrall.xml b/PROMS/Formats/fmtall/BNPPalrall.xml
index 6dc01b18..6211148b 100644
Binary files a/PROMS/Formats/fmtall/BNPPalrall.xml and b/PROMS/Formats/fmtall/BNPPalrall.xml differ
diff --git a/PROMS/Formats/fmtall/BNPPbckall.xml b/PROMS/Formats/fmtall/BNPPbckall.xml
index a0ec3f4e..c60ee7f3 100644
Binary files a/PROMS/Formats/fmtall/BNPPbckall.xml and b/PROMS/Formats/fmtall/BNPPbckall.xml differ
diff --git a/PROMS/Formats/fmtall/BNPPcklall.xml b/PROMS/Formats/fmtall/BNPPcklall.xml
index 955d9a71..26d1c297 100644
Binary files a/PROMS/Formats/fmtall/BNPPcklall.xml and b/PROMS/Formats/fmtall/BNPPcklall.xml differ
diff --git a/PROMS/Formats/fmtall/BNPPdevall.xml b/PROMS/Formats/fmtall/BNPPdevall.xml
index 2ec949a1..1edd55d6 100644
Binary files a/PROMS/Formats/fmtall/BNPPdevall.xml and b/PROMS/Formats/fmtall/BNPPdevall.xml differ
diff --git a/PROMS/Formats/fmtall/BNPPgopall.xml b/PROMS/Formats/fmtall/BNPPgopall.xml
index a5cc39e4..5a5da7fc 100644
Binary files a/PROMS/Formats/fmtall/BNPPgopall.xml and b/PROMS/Formats/fmtall/BNPPgopall.xml differ
diff --git a/PROMS/Formats/fmtall/BNPPsamall.xml b/PROMS/Formats/fmtall/BNPPsamall.xml
index 70031546..6f42f526 100644
Binary files a/PROMS/Formats/fmtall/BNPPsamall.xml and b/PROMS/Formats/fmtall/BNPPsamall.xml differ
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index c56881f1..31686e9b 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -3808,6 +3808,14 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _PaginateOnFirstSubstep2X, "@PaginateOnFirstSubstep2X");
 			}
 		}
+		private LazyLoad<bool> _PageBreakParentWithTable;	// B2020-101: Add format flag for table pagination
+		public bool PageBreakParentWithTable
+		{
+			get
+			{
+				return LazyLoad(ref _PageBreakParentWithTable, "@PageBreakParentWithTable");
+			}
+		}
 		private LazyLoad<bool> _UseHalfLines;
 		public bool UseHalfLines
 		{
diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs
index 7e59279c..08b19a32 100644
--- a/PROMS/Volian.Print.Library/Pagination.cs
+++ b/PROMS/Volian.Print.Library/Pagination.cs
@@ -1010,7 +1010,9 @@ namespace Volian.Print.Library
 					//           The following logic will walk up to each parent level to see try and get as many parent step levels on the same page
 					//           as the Table.
 					// B2020-035 added a null reference check to fix printing crash
-					if (paraBreak != null && paraBreak.MyItemInfo.IsTable && paraBreak.MyParent.YSize < (yPageSize - (myTopMsgSpace + SixLinesPerInch) - myBottomMsgSpace))
+					// B2020-101: Proms crashes when trying to keep table with parent when table is very large.  Add format flag for Barakah,
+					//			code was added for B2020-032 and only want it for Barakah
+					if (MyItemInfo.ActiveFormat.MyStepSectionLayoutData.PageBreakParentWithTable && paraBreak != null && paraBreak.MyItemInfo.IsTable && paraBreak.MyParent.YSize < (yPageSize - (myTopMsgSpace + SixLinesPerInch) - myBottomMsgSpace))
 					{
 						vlnParagraph tparent = paraBreak.MyParent;
 						while (!tparent.MyItemInfo.IsHigh && tparent.MyParent.YSize < (yPageSize - (myTopMsgSpace + SixLinesPerInch) - myBottomMsgSpace))