diff --git a/PROMS/Formats/fmtall/CPDEVall.xml b/PROMS/Formats/fmtall/CPDEVall.xml
index 49d3f0f5..de28c2d3 100644
Binary files a/PROMS/Formats/fmtall/CPDEVall.xml and b/PROMS/Formats/fmtall/CPDEVall.xml differ
diff --git a/PROMS/Formats/fmtall/CPFDEVall.xml b/PROMS/Formats/fmtall/CPFDEVall.xml
index 767caa1c..44247a28 100644
Binary files a/PROMS/Formats/fmtall/CPFDEVall.xml and b/PROMS/Formats/fmtall/CPFDEVall.xml differ
diff --git a/PROMS/Formats/fmtall/ComPeakFlex11all.xml b/PROMS/Formats/fmtall/ComPeakFlex11all.xml
index e3555c41..2b3e2a62 100644
Binary files a/PROMS/Formats/fmtall/ComPeakFlex11all.xml and b/PROMS/Formats/fmtall/ComPeakFlex11all.xml differ
diff --git a/PROMS/Formats/fmtall/ComPeakFlexall.xml b/PROMS/Formats/fmtall/ComPeakFlexall.xml
index aea04a59..805e795a 100644
Binary files a/PROMS/Formats/fmtall/ComPeakFlexall.xml and b/PROMS/Formats/fmtall/ComPeakFlexall.xml differ
diff --git a/PROMS/Formats/fmtall/TUECDEVall.xml b/PROMS/Formats/fmtall/TUECDEVall.xml
index 8c8fac49..4d8517db 100644
Binary files a/PROMS/Formats/fmtall/TUECDEVall.xml and b/PROMS/Formats/fmtall/TUECDEVall.xml differ
diff --git a/PROMS/Formats/fmtall/TUECSAMG1all.xml b/PROMS/Formats/fmtall/TUECSAMG1all.xml
index b2be9c8a..582631a3 100644
Binary files a/PROMS/Formats/fmtall/TUECSAMG1all.xml and b/PROMS/Formats/fmtall/TUECSAMG1all.xml differ
diff --git a/PROMS/Formats/fmtall/TUECSAMGall.xml b/PROMS/Formats/fmtall/TUECSAMGall.xml
index 67dfbeba..7746c464 100644
Binary files a/PROMS/Formats/fmtall/TUECSAMGall.xml and b/PROMS/Formats/fmtall/TUECSAMGall.xml differ
diff --git a/PROMS/Formats/fmtall/TUECall.xml b/PROMS/Formats/fmtall/TUECall.xml
index 37f5c0b0..65adcb98 100644
Binary files a/PROMS/Formats/fmtall/TUECall.xml and b/PROMS/Formats/fmtall/TUECall.xml differ
diff --git a/PROMS/Formats/genmacall/cpdev.svg b/PROMS/Formats/genmacall/cpdev.svg
index f7746192..c55e7800 100644
Binary files a/PROMS/Formats/genmacall/cpdev.svg and b/PROMS/Formats/genmacall/cpdev.svg differ
diff --git a/PROMS/Formats/genmacall/cpfdev.svg b/PROMS/Formats/genmacall/cpfdev.svg
index 980e68dd..49173593 100644
Binary files a/PROMS/Formats/genmacall/cpfdev.svg and b/PROMS/Formats/genmacall/cpfdev.svg differ
diff --git a/PROMS/Formats/genmacall/tuec.svg b/PROMS/Formats/genmacall/tuec.svg
index ccce882f..2d212c48 100644
Binary files a/PROMS/Formats/genmacall/tuec.svg and b/PROMS/Formats/genmacall/tuec.svg differ
diff --git a/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs b/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs
index 98647f8f..82cbd45f 100644
--- a/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs
+++ b/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs
@@ -746,7 +746,7 @@ namespace RODBInterface
 					string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
 					//applicValues += ",";
 					XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
-					if (cn == null)
+					if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero
 						applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
 					else
 					{
diff --git a/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs b/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs
index 6ade16c3..9e1c5208 100644
--- a/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs
+++ b/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs
@@ -473,7 +473,7 @@ namespace ctlXMLEditLib
 				nd = node.SelectSingleNode(str);
 				// if not found with just the string, search the tree.
 				if (nd==null)nd = node.SelectSingleNode("*/"+str);
-				if (nd == null) 
+				if (nd == null || nd.InnerText.Length==0) // B2024-004 use Parent value if Child text length is zero
 					GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value
 				else
 				{