diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 42b1324349..fba992cf1b 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -375,9 +375,7 @@ static bool handleChatPersistTimeChanged(const LLSD& newvalue)
 {
 	if(gConsole)
 	{
-		// <FS> Changed for FIRE-805
-		//gConsole->setLinePersistTime((F32) newvalue.asReal());
-		gConsole->setLinePersistTime((F32) newvalue.asInteger());
+		gConsole->setLinePersistTime((F32) newvalue.asReal());
 	}
 	return true;
 }
@@ -1006,7 +1004,7 @@ void settings_setup_listeners()
 	gSavedSettings.getControl("RenderPerformanceTest")->getSignal()->connect(boost::bind(&handleRenderPerfTestChanged, _2));
 	gSavedSettings.getControl("TextureMemory")->getSignal()->connect(boost::bind(&handleVideoMemoryChanged, _2));
 	gSavedSettings.getControl("ChatConsoleFontSize")->getSignal()->connect(boost::bind(&handleChatFontSizeChanged, _2));
-	gSavedSettings.getControl("NearbyToastLifeTime")->getSignal()->connect(boost::bind(&handleChatPersistTimeChanged, _2));
+	gSavedSettings.getControl("ChatPersistTime")->getSignal()->connect(boost::bind(&handleChatPersistTimeChanged, _2));
 	gSavedSettings.getControl("ConsoleMaxLines")->getSignal()->connect(boost::bind(&handleConsoleMaxLinesChanged, _2));
 	gSavedSettings.getControl("UploadBakedTexOld")->getSignal()->connect(boost::bind(&handleUploadBakedTexOldChanged, _2));
 	gSavedSettings.getControl("UseOcclusion")->getSignal()->connect(boost::bind(&handleUseOcclusionChanged, _2));
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 09aecc684b..93716a45f4 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2089,11 +2089,7 @@ void LLViewerWindow::initBase()
 	cp.parse_urls(true); // <FS:Ansariel> Enable URL parsing for the chat console
 	cp.background_image("Rounded_Square"); // <FS:Ansariel> Configurable background for different console types
 	cp.session_support(true); // <FS:Ansariel> Session support
-	// <FS:AO>, have console respect/reuse NearbyToastLifeTime for the length popup chat messages are displayed.
-	//cp.persist_time(gSavedSettings.getF32("ChatPersistTime"));
-	cp.persist_time((F32)gSavedSettings.getS32("NearbyToastLifeTime"));
-	// </FS:AO>
-
+	cp.persist_time(gSavedSettings.getF32("ChatPersistTime"));
 	cp.font_size_index(gSavedSettings.getS32("ChatConsoleFontSize"));
 	cp.follows.flags(FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_BOTTOM);
 	gConsole = LLUICtrlFactory::create<LLConsole>(cp);
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 8f0f9ed0d2..cba26f5889 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -408,6 +408,12 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
 			{
 				LL_WARNS() << "Bogus volume parameters in object " << getID() << LL_ENDL;
 				LL_WARNS() << getRegion()->getOriginGlobal() << LL_ENDL;
+				// <FS:Beq> [FIRE-16995] [CRASH] Continuous crashing upon entering 3 adjacent sims incl. Hathian, D8, Devil's Pocket
+				// A bad object entry in a .slc simobject cache can result in an unreadable/unusable volume 
+				// This leaves the volume in an uncertain state and can result in a crash when later code access an uninitialised pointer
+				// return an INVALID_UPDATE instead
+				return(INVALID_UPDATE);
+				// </FS:Beq>
 			}
 
 			volume_params.setSculptID(sculpt_id, sculpt_type);
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 659667cf6f..e7f5d4b42a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -254,12 +254,12 @@
              label="Use full width of screen for console"/>
             <spinner
              top_pad="2"
-             control_name="NearbyToastLifeTime"
+             control_name="ChatPersistTime"
              decimal_digits="0"
              follows="left|top"
              height="20"
              increment="1"
-             initial_value="10"
+             initial_value="20"
              label="Fade chat after:"
              label_width="90"
              left="25"