diff --git a/.gitignore b/.gitignore
index 784b7796d7..880dec30c6 100755
--- a/.gitignore
+++ b/.gitignore
@@ -85,4 +85,6 @@ indra/newview/avatar_lad.log
 indra/newview/pilot.txt
 indra/newview/pilot.xml
 #*.rej
-.*\.wixobj
\ No newline at end of file
+.*\.wixobj
+my_autobuild.xml
+.vscode
\ No newline at end of file
diff --git a/indra/llinventory/llfoldertype.cpp b/indra/llinventory/llfoldertype.cpp
index b0daf639fa..66da7aab6d 100644
--- a/indra/llinventory/llfoldertype.cpp
+++ b/indra/llinventory/llfoldertype.cpp
@@ -92,7 +92,7 @@ LLFolderDictionary::LLFolderDictionary()
 	addEntry(LLFolderType::FT_MESH, 				new FolderEntry("mesh",	TRUE));
 
 	addEntry(LLFolderType::FT_INBOX, 				new FolderEntry("inbox",	TRUE));
-	addEntry(LLFolderType::FT_OUTBOX, 				new FolderEntry("outbox",	TRUE));
+	addEntry(LLFolderType::FT_OUTBOX, 				new FolderEntry("outbox",	FALSE)); // <FS:Ansariel> Make obsolete Merchant Outbox folder deletable
 	
 	addEntry(LLFolderType::FT_BASIC_ROOT,			new FolderEntry("basic_rt", TRUE));
 
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 29f134eb67..0d47172274 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3777,6 +3777,19 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>CurrentlyUsingBakesOnMesh</key>
+    <map>
+      <key>Comment</key>
+      <string>Are we currently on a grid that uses bakes on mesh? Persisted to force rebakes on login to named grids.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+      <key>Backup</key>
+      <integer>0</integer>
+    </map>
     <key>CurrentGrid</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp
index 0ac15dc9ea..8a84c44de4 100644
--- a/indra/newview/llviewerjoystick.cpp
+++ b/indra/newview/llviewerjoystick.cpp
@@ -114,7 +114,13 @@ NDOF_HotPlugResult LLViewerJoystick::HotPlugAddCallback(NDOF_Device *dev)
 	if (joystick->mDriverState == JDS_UNINITIALIZED)
 	{
         LL_INFOS() << "HotPlugAddCallback: will use device:" << LL_ENDL;
+
+		// <FS:ND> Disable for Linux till vs017 gets merged in to no having to support multiple version of libndofdev
+#ifndef LL_LINUX
 		ndof_dump(dev);
+#endif
+		// </FS:ND>
+		
 		joystick->mNdofDev = dev;
         joystick->mDriverState = JDS_INITIALIZED;
         res = NDOF_KEEP_HOTPLUGGED;
@@ -133,7 +139,13 @@ void LLViewerJoystick::HotPlugRemovalCallback(NDOF_Device *dev)
 	{
         LL_INFOS() << "HotPlugRemovalCallback: joystick->mNdofDev=" 
 				<< joystick->mNdofDev << "; removed device:" << LL_ENDL;
+
+		// <FS:ND> Disable for Linux till vs017 gets merged in to no having to support multiple version of libndofdev
+#ifndef LL_LINUX
 		ndof_dump(dev);
+#endif
+		// </FS:ND>
+
 		joystick->mDriverState = JDS_UNINITIALIZED;
 	}
 	joystick->updateEnabled(true);
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index a9a055baec..e65898f014 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -10770,8 +10770,20 @@ void LLVOAvatar::updateRegion(LLViewerRegion *regionp)
 {
 	//<FS:Beq> BOM constrain number of bake requests when BOM not supported,
 	// TEX_HEAD_TATTOO and BAKED_LEFT_ARM are the first new entries
-	// TODO(Beq): We might need to force some kind off rebake here?
+	
 	sMaxBakes = gAgent.getRegion()->bakesOnMeshEnabled()?BAKED_NUM_INDICES:BAKED_LEFT_ARM;
+
+	if(!gSavedSettings.getBOOL("CurrentlyUsingBakesOnMesh") != getRegion()->bakesOnMeshEnabled())
+	{
+			// force a rebake when the last grid we were on (including previous login) had different BOM support
+			// This replicates forceAppearanceUpdate rather than pulling in the whole of llavatarself.
+		if(!LLGridManager::instance().isInSecondLife())
+		{
+			doAfterInterval(boost::bind(&LLVOAvatarSelf::forceBakeAllTextures,	gAgentAvatarp.get(), true), 5.0);
+		}
+		// update the setting even if we are in SL so that switch SL to OS and back 
+		gSavedSettings.setBOOL("CurrentlyUsingBakesOnMesh", getRegion()->bakesOnMeshEnabled());
+	}
 	//</FS:Beq>
 	LLViewerObject::updateRegion(regionp);
 }