diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml
index f729d427..02f22123 100644
Binary files a/PROMS/Formats/fmtall/BASEall.xml and b/PROMS/Formats/fmtall/BASEall.xml differ
diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs
index d43134b5..304146a2 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
@@ -2922,6 +2922,7 @@ namespace VEPROMS
 				dlgFindReplace.Mydocversion = _SelectedDVI;
 				dlgFindReplace.Visible = true;
 				dlgFindReplace.MyDisplayBookMarks = displayBookMarks;
+				dlgFindReplace.SetFocusToTextBox(); // bug fix: B2016-107, when Find/Replace is initially opened, set the cursor focus to the Find Text box
 			}
 			else if (args.PanelTabName == "SpellChecker")
 			{
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs
index ce5bfe3e..e716d232 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs
@@ -261,11 +261,16 @@ public static string DBServer
 			{
 				if (LastDatabase != "NoDefault" && LastDatabase != "")
 				{
-					if (System.Windows.Forms.MessageBox.Show("Open " + LastDatabase, "Reopen Last Database", System.Windows.Forms.MessageBoxButtons.YesNo, System.Windows.Forms.MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.Yes)
+					System.Windows.Forms.DialogResult dlgrslt = System.Windows.Forms.MessageBox.Show("Open " + LastDatabase, "Reopen Last Database", System.Windows.Forms.MessageBoxButtons.YesNoCancel, System.Windows.Forms.MessageBoxIcon.Question);
+					if (dlgrslt == System.Windows.Forms.DialogResult.Yes)
 					{
 						SelectedDatabase = LastDatabase;
 						return constr.Replace("{MENU}", _SelectedDatabase);
 					}
+					else if (dlgrslt == System.Windows.Forms.DialogResult.Cancel)
+					{
+						Process.GetCurrentProcess().Kill();  // exit PROMS
+					}
 				}
 				System.Windows.Forms.ContextMenuStrip cms = BuildDatabaseMenu(constr);
 				while (_SelectedDatabase == null)