diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
index eb72dd6f..8cf6048f 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
@@ -2122,6 +2122,9 @@ namespace VEPROMS.CSLA.Library
 							string wordMatchBeg = Regex.IsMatch(replaceWord.Substring(0, 1), @"\W") ? "" : @"(?<=\W|^)";
 							string wordMatchEnd = Regex.IsMatch(replaceWord.Substring(replaceWord.Length - 1, 1), @"\W") ? "" : @"(?=\W|$)";
 							string pat = wordMatchBeg + @"(?<!\\u160\?|\\u8209\?|\\b|\-)" + replaceWord + @"(?!\\u160\?|\\u8209\?|\-)" + wordMatchEnd;
+							// C2021-061:  For Barakah don't do replace if word is surrounded by " or ', i.e. they are no longer delimiters
+							if (_MyItemInfo != null && _MyItemInfo.ActiveFormat != null && _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.NoReplaceQuoteWords)
+								pat = wordMatchBeg + @"(?<!\\u160\?|\\u8209\?|\\b|\-|""|')" + replaceWord + @"(?!\\u160\?|\\u8209\?|\-|""|')" + wordMatchEnd;
 							dicReplaceRegex.Add(rs, new Regex(pat, myOptions));
 							//ProfileTimer.Pop(profileDepth3);
 						}
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index 71d3cccd..13a49071 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -2442,6 +2442,15 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _ReplaceWordsInROs, "@ReplaceWordsInROs");
 			}
 		}
+		// C2021-061:  For Barakah don't do replace if word is surrounded by " or '
+		private LazyLoad<bool> _NoReplaceQuoteWords;
+		public bool NoReplaceQuoteWords
+		{
+			get
+			{
+				return LazyLoad(ref _NoReplaceQuoteWords, "@NoReplaceQuoteWords");
+			}
+		}
 		private LazyLoad<bool> _UseMetaSections;
 		public bool UseMetaSections
 		{