Merge pull request 'Development' (#454) from Development into master

Merging all changes from development into master after successful testing.

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/RODefFrm.cs

@@ -1251,6 +1251,9 @@ namespace ROEditor
 				{
 					tbMenuVal.Text = tbMenuVal.Text.Replace($"<{origname}>", $"<{newname}>");
 					tbRetVal.Text = tbRetVal.Text.Replace($"<{origname}>", $"<{newname}>");
+					//CSM-C2024-035 This is needed for items like Setpoint Value that may have commas with field lengths in them
+					tbMenuVal.Text = tbMenuVal.Text.Replace($"<{origname},", $"<{newname},");
+					tbRetVal.Text = tbRetVal.Text.Replace($"<{origname},", $"<{newname},");
 				}
 			}
 			else 

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs

@@ -2667,8 +2667,9 @@ namespace RODBInterface
 					bool isused = RODB_CheckForStandardName(oldname);
 					if (isused == true)
 					{
-						MessageBox.Show("The field name is used to define new Setpoints or Graphics Database.\n The update will be for this local (database) group only.", "Field name modification.");
+                        DialogResult result = MessageBox.Show($"The field name is used to define new Setpoints or Graphics Database.\n\n The update will be for this local (database) group only.\n\n Select OK to update local definition for all items in that table ({GetTopParentName(myelem)}).", "Field name modification.", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
 						changegeneric = false;
+						if(result == DialogResult.Cancel) return false;
 					}
 				}