diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp
index f93e9b88cf..24e62a1bb9 100644
--- a/indra/newview/llpreviewgesture.cpp
+++ b/indra/newview/llpreviewgesture.cpp
@@ -525,6 +525,7 @@ void LLPreviewGesture::addKeys()
 void LLPreviewGesture::addAnimations()
 {
     LLComboBox* combo = mAnimationCombo;
+    LLUUID old_value = combo->getCurrentID();
 
     combo->removeall();
 
@@ -573,6 +574,8 @@ void LLPreviewGesture::addAnimations()
 
         combo->add(item->getName(), item->getAssetUUID(), ADD_BOTTOM);
     }
+
+    combo->setCurrentByID(old_value);
 }
 
 
@@ -1421,7 +1424,7 @@ void LLPreviewGesture::onCommitAnimation(LLUICtrl* ctrl, void* data)
         {
             // Assign the animation name
             LLGestureStepAnimation* anim_step = (LLGestureStepAnimation*)step;
-            if (self->mAnimationCombo->getCurrentIndex() == 0)
+            if (self->mAnimationCombo->getCurrentIndex() <= 0)
             {
                 anim_step->mAnimName.clear();
                 anim_step->mAnimAssetID.setNull();
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index 602c09e674..b17b5b5aa5 100644
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -649,6 +649,16 @@ void LLPreviewTexture::onFileLoadedForSaveTGA(bool success,
             self->getWindow()->decBusyCount();
             self->mLoadingFullImage = false;
         }
+        if (!success)
+        {
+            LL_WARNS("FileSaveAs") << "Failed to download file " << *item_uuid << " for saving."
+                << " Is missing: " << (src_vi->isMissingAsset() ? "true" : "false")
+                << " Discard: " << src_vi->getDiscardLevel()
+                << " Raw discard: " << discard_level
+                << " Size: " << src_vi->getWidth() << "x" << src_vi->getHeight()
+                << " Has GL texture: " << (src_vi->hasGLTexture() ? "true" : "false")
+                << " Has saved raw image: " << (src_vi->hasSavedRawImage() ? "true" : "false") << LL_ENDL;
+        }
     }
 
     if( self && final && success )
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 3c35072f7a..57484f2c98 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -76,7 +76,7 @@ LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sSmokeImagep = nullptr
 LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sFlatNormalImagep = nullptr;
 LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sDefaultIrradiancePBRp;
 // [SL:KB] - Patch: Render-TextureToggle (Catznip-4.0)
-LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sDefaultDiffuseImagep = NULL;
+LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sDefaultDiffuseImagep = nullptr;
 // [/SL:KB]
 LLViewerMediaTexture::media_map_t LLViewerMediaTexture::sMediaMap;
 LLTexturePipelineTester* LLViewerTextureManager::sTesterp = nullptr;
@@ -519,8 +519,12 @@ void LLViewerTexture::updateClass()
 
     F32 budget = max_vram_budget == 0 ? (F32)gGLManager.mVRAM : (F32)max_vram_budget;
 
-    // try to leave half a GB for everyone else, but keep at least 768MB for ourselves
-    F32 target = llmax(budget - 512.f, MIN_VRAM_BUDGET);
+    // Try to leave at least half a GB for everyone else and for bias,
+    // but keep at least 768MB for ourselves
+    // Viewer can 'overshoot' target when scene changes, if viewer goes over budget it
+    // can negatively impact performance, so leave 20% of a breathing room for
+    // 'bias' calculation to kick in.
+    F32 target = llmax(llmin(budget - 512.f, budget * 0.8f), MIN_VRAM_BUDGET);
     sFreeVRAMMegabytes = llmax(target - used, 0.f);
 
     F32 over_pct = (used - target) / target;
@@ -536,7 +540,7 @@ void LLViewerTexture::updateClass()
         // slam to 1.5 bias the moment we hit low memory (discards off screen textures immediately)
         sDesiredDiscardBias = llmax(sDesiredDiscardBias, 1.5f);
 
-        if (is_sys_low)
+        if (is_sys_low || over_pct > 2.f)
         { // if we're low on system memory, emergency purge off screen textures to avoid a death spiral
             LL_WARNS() << "Low system memory detected, emergency downrezzing off screen textures" << LL_ENDL;
             for (auto& image : gTextureList)
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 3522dbcddd..61e8e69586 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -1185,6 +1185,11 @@ F32 LLViewerTextureList::updateImagesFetchTextures(F32 max_time)
 
     //update MIN_UPDATE_COUNT or 5% of other textures, whichever is greater
     update_count = llmax((U32) MIN_UPDATE_COUNT, (U32) mUUIDMap.size()/20);
+    if (LLViewerTexture::sDesiredDiscardBias > 1.f)
+    {
+        // we are over memory target, update more agresively
+        update_count = (S32)(update_count * LLViewerTexture::sDesiredDiscardBias);
+    }
     update_count = llmin(update_count, (U32) mUUIDMap.size());
 
     { // copy entries out of UUID map to avoid iterator invalidation from deletion inside updateImageDecodeProiroty or updateFetch below