diff --git a/.github/actions/spelling/dictionary/apis.txt b/.github/actions/spelling/dictionary/apis.txt
index b1bbc345616..d3b3ac73bce 100644
--- a/.github/actions/spelling/dictionary/apis.txt
+++ b/.github/actions/spelling/dictionary/apis.txt
@@ -9,6 +9,7 @@ COLORPROPERTY
 CXICON
 CYICON
 D2DERR_SHADER_COMPILE_FAILED
+dataobject
 DERR
 environstrings
 EXPCMDFLAGS
@@ -22,6 +23,7 @@ Hashtable
 HIGHCONTRASTON
 HIGHCONTRASTW
 href
+IApp
 IAppearance
 IAsync
 IBind
@@ -36,6 +38,7 @@ IExplorer
 IInheritable
 IMap
 IObject
+IPackage
 IPeasant
 IStorage
 ITab
diff --git a/.github/actions/spelling/dictionary/dictionary.txt b/.github/actions/spelling/dictionary/dictionary.txt
index 4d4bde14c90..de26c13938a 100644
--- a/.github/actions/spelling/dictionary/dictionary.txt
+++ b/.github/actions/spelling/dictionary/dictionary.txt
@@ -341774,6 +341774,7 @@ reimplanted
 reimplanting
 reimplants
 reimplement
+reimplementation
 reimplemented
 reimplied
 reimply
diff --git a/.github/actions/spelling/expect/expect.txt b/.github/actions/spelling/expect/expect.txt
index 600efc297be..3df6051f12d 100644
--- a/.github/actions/spelling/expect/expect.txt
+++ b/.github/actions/spelling/expect/expect.txt
@@ -22,6 +22,7 @@ activatable
 ACTIVEBORDER
 ACTIVECAPTION
 ADDALIAS
+ADDB
 ADDREF
 addressof
 ADDSTRING
@@ -1636,6 +1637,7 @@ ONECOREWINDOWS
 onehalf
 ONLCR
 Oo
+openconsoleproxy
 openbash
 opencode
 opencon
diff --git a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj
index ecd83cc86f1..b10a887323c 100644
--- a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj
+++ b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj
@@ -15,6 +15,10 @@
     <AppxOSMaxVersionTestedReplaceManifestVersion>false</AppxOSMaxVersionTestedReplaceManifestVersion>
     <OCExecutionAliasName Condition="'$(WindowsTerminalBranding)'==''">wtd</OCExecutionAliasName>
     <OCExecutionAliasName Condition="'$(OCExecutionAliasName)'==''">wt</OCExecutionAliasName>
+    <!-- VS 16.8 causes WAP projects to accidentally package System.Core.dll (from the CLR).
+         This has been fixed in VS 16.9 using the property below. It's safe for us to include
+         it here, even after 16.9 comes out. -->
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <PropertyGroup>
     <ProjectGuid>CA5CAD1A-224A-4171-B13A-F16E576FDD12</ProjectGuid>
diff --git a/src/cascadia/TerminalApp/ColorPickupFlyout.xaml b/src/cascadia/TerminalApp/ColorPickupFlyout.xaml
index 8ea72093ae0..197e901348a 100644
--- a/src/cascadia/TerminalApp/ColorPickupFlyout.xaml
+++ b/src/cascadia/TerminalApp/ColorPickupFlyout.xaml
@@ -12,7 +12,7 @@
         </Style>
     </Flyout.FlyoutPresenterStyle>
     <StackPanel Orientation="Horizontal">
-        <StackPanel>
+        <StackPanel XYFocusKeyboardNavigation="Enabled">
             <VariableSizedWrapGrid Orientation="Horizontal" MaximumRowsOrColumns="4" HorizontalAlignment="Center" Margin="0, 3, 0, 0">
                 <VariableSizedWrapGrid.Resources>
                     <Style TargetType="Rectangle">
diff --git a/src/cascadia/TerminalApp/CommandPalette.cpp b/src/cascadia/TerminalApp/CommandPalette.cpp
index 68581dd2f99..d306ce1ce60 100644
--- a/src/cascadia/TerminalApp/CommandPalette.cpp
+++ b/src/cascadia/TerminalApp/CommandPalette.cpp
@@ -261,15 +261,15 @@ namespace winrt::TerminalApp::implementation
                 {
                     SelectNextItem(false);
                     e.Handled(true);
+                    return;
                 }
                 else if (action.Action() == ShortcutAction::NextTab)
                 {
                     SelectNextItem(true);
                     e.Handled(true);
+                    return;
                 }
             }
-
-            return;
         }
 
         if (key == VirtualKey::Home && ctrlDown)
diff --git a/src/cascadia/TerminalApp/CommandPalette.xaml b/src/cascadia/TerminalApp/CommandPalette.xaml
index 762a4ba7610..43f4c0a5a88 100644
--- a/src/cascadia/TerminalApp/CommandPalette.xaml
+++ b/src/cascadia/TerminalApp/CommandPalette.xaml
@@ -40,7 +40,6 @@ the MIT License. See LICENSE in the project root for license information. -->
                 <!-- This HorizontalContentAlignment="Stretch" is important
                         to make sure it takes the entire width of the line -->
                 <ListViewItem HorizontalContentAlignment="Stretch"
-                                  IsTabStop="False"
                                   AutomationProperties.Name="{x:Bind Item.Name, Mode=OneWay}"
                                   AutomationProperties.AcceleratorKey="{x:Bind Item.KeyChordText, Mode=OneWay}">
 
@@ -112,7 +111,6 @@ the MIT License. See LICENSE in the project root for license information. -->
                 <!-- This HorizontalContentAlignment="Stretch" is important
                         to make sure it takes the entire width of the line -->
                 <ListViewItem HorizontalContentAlignment="Stretch"
-                                  IsTabStop="False"
                                   AutomationProperties.Name="{x:Bind Item.Name, Mode=OneWay}"
                                   AutomationProperties.AcceleratorKey="{x:Bind Item.KeyChordText, Mode=OneWay}">
 
diff --git a/src/cascadia/TerminalApp/TabHeaderControl.cpp b/src/cascadia/TerminalApp/TabHeaderControl.cpp
index 53e45c93a9f..a4ae8189a1b 100644
--- a/src/cascadia/TerminalApp/TabHeaderControl.cpp
+++ b/src/cascadia/TerminalApp/TabHeaderControl.cpp
@@ -106,7 +106,11 @@ namespace winrt::TerminalApp::implementation
     // - Hides the rename box and displays the title text block
     void TabHeaderControl::_CloseRenameBox()
     {
-        HeaderRenamerTextBox().Visibility(Windows::UI::Xaml::Visibility::Collapsed);
-        HeaderTextBlock().Visibility(Windows::UI::Xaml::Visibility::Visible);
+        if (HeaderRenamerTextBox().Visibility() == Windows::UI::Xaml::Visibility::Visible)
+        {
+            HeaderRenamerTextBox().Visibility(Windows::UI::Xaml::Visibility::Collapsed);
+            HeaderTextBlock().Visibility(Windows::UI::Xaml::Visibility::Visible);
+            _RenameEndedHandlers(*this, nullptr);
+        }
     }
 }
diff --git a/src/cascadia/TerminalApp/TabHeaderControl.h b/src/cascadia/TerminalApp/TabHeaderControl.h
index 59004f8bedf..30aacc3d746 100644
--- a/src/cascadia/TerminalApp/TabHeaderControl.h
+++ b/src/cascadia/TerminalApp/TabHeaderControl.h
@@ -25,6 +25,8 @@ namespace winrt::TerminalApp::implementation
         OBSERVABLE_GETSET_PROPERTY(double, RenamerMaxWidth, _PropertyChangedHandlers);
         OBSERVABLE_GETSET_PROPERTY(winrt::TerminalApp::TerminalTabStatus, TabStatus, _PropertyChangedHandlers);
 
+        TYPED_EVENT(RenameEnded, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
+
     private:
         bool _receivedKeyDown{ false };
         bool _renameCancelled{ false };
diff --git a/src/cascadia/TerminalApp/TabHeaderControl.idl b/src/cascadia/TerminalApp/TabHeaderControl.idl
index 86a6bc0b717..3bc12471f09 100644
--- a/src/cascadia/TerminalApp/TabHeaderControl.idl
+++ b/src/cascadia/TerminalApp/TabHeaderControl.idl
@@ -17,5 +17,6 @@ namespace TerminalApp
         TerminalTabStatus TabStatus { get;  set; };
 
         event TitleChangeRequestedArgs TitleChangeRequested;
+        event Windows.Foundation.TypedEventHandler<Object, Object> RenameEnded;
     }
 }
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
index 22ec513eb95..debb96e6c03 100644
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -858,6 +858,19 @@ namespace winrt::TerminalApp::implementation
             }
         });
 
+        newTabImpl->TabRenamerDeactivated([weakThis{ get_weak() }](auto&& /*s*/, auto&& /*e*/) {
+            if (const auto page{ weakThis.get() })
+            {
+                if (!page->_newTabButton.Flyout().IsOpen())
+                {
+                    if (const auto tab{ page->_GetFocusedTab() })
+                    {
+                        tab.Focus(FocusState::Programmatic);
+                    }
+                }
+            }
+        });
+
         if (debugConnection) // this will only be set if global debugging is on and tap is active
         {
             TermControl newControl{ settings, debugConnection };
diff --git a/src/cascadia/TerminalApp/TerminalTab.h b/src/cascadia/TerminalApp/TerminalTab.h
index d63392ec2f5..f8fb560ee60 100644
--- a/src/cascadia/TerminalApp/TerminalTab.h
+++ b/src/cascadia/TerminalApp/TerminalTab.h
@@ -89,6 +89,7 @@ namespace winrt::TerminalApp::implementation
         DECLARE_EVENT(ColorSelected, _colorSelected, winrt::delegate<winrt::Windows::UI::Color>);
         DECLARE_EVENT(ColorCleared, _colorCleared, winrt::delegate<>);
         DECLARE_EVENT(TabRaiseVisualBell, _TabRaiseVisualBellHandlers, winrt::delegate<>);
+        FORWARDED_TYPED_EVENT(TabRenamerDeactivated, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable, (&_headerControl), RenameEnded);
 
     private:
         std::shared_ptr<Pane> _rootPane{ nullptr };
diff --git a/src/cascadia/TerminalControl/TermControl.cpp b/src/cascadia/TerminalControl/TermControl.cpp
index 39c9de3b043..69a53c2e976 100644
--- a/src/cascadia/TerminalControl/TermControl.cpp
+++ b/src/cascadia/TerminalControl/TermControl.cpp
@@ -1100,8 +1100,18 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         // selection.
         if (_terminal->IsSelectionActive() && !KeyEvent::IsModifierKey(vkey) && vkey != VK_SNAPSHOT)
         {
-            _terminal->ClearSelection();
-            _renderer->TriggerSelection();
+            const CoreWindow window = CoreWindow::GetForCurrentThread();
+            const auto leftWinKeyState = window.GetKeyState(VirtualKey::LeftWindows);
+            const auto rightWinKeyState = window.GetKeyState(VirtualKey::RightWindows);
+            const auto isLeftWinKeyDown = WI_IsFlagSet(leftWinKeyState, CoreVirtualKeyStates::Down);
+            const auto isRightWinKeyDown = WI_IsFlagSet(rightWinKeyState, CoreVirtualKeyStates::Down);
+
+            // GH#8791 - don't dismiss selection if Windows key was also pressed as a key-combination.
+            if (!isLeftWinKeyDown && !isRightWinKeyDown)
+            {
+                _terminal->ClearSelection();
+                _renderer->TriggerSelection();
+            }
 
             if (vkey == VK_ESCAPE)
             {
@@ -1425,48 +1435,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
                 }
             }
 
-            if (terminalPosition != _lastHoveredCell)
-            {
-                const auto uri = _terminal->GetHyperlinkAtPosition(terminalPosition);
-                if (!uri.empty())
-                {
-                    // Update the tooltip with the URI
-                    HoveredUri().Text(uri);
-
-                    // Set the border thickness so it covers the entire cell
-                    const auto charSizeInPixels = CharacterDimensions();
-                    const auto htInDips = charSizeInPixels.Height / SwapChainPanel().CompositionScaleY();
-                    const auto wtInDips = charSizeInPixels.Width / SwapChainPanel().CompositionScaleX();
-                    const Thickness newThickness{ wtInDips, htInDips, 0, 0 };
-                    HyperlinkTooltipBorder().BorderThickness(newThickness);
-
-                    // Compute the location of the top left corner of the cell in DIPS
-                    const til::size marginsInDips{ til::math::rounding, GetPadding().Left, GetPadding().Top };
-                    const til::point startPos{ terminalPosition.X, terminalPosition.Y };
-                    const til::size fontSize{ _actualFont.GetSize() };
-                    const til::point posInPixels{ startPos * fontSize };
-                    const til::point posInDIPs{ posInPixels / SwapChainPanel().CompositionScaleX() };
-                    const til::point locationInDIPs{ posInDIPs + marginsInDips };
-
-                    // Move the border to the top left corner of the cell
-                    OverlayCanvas().SetLeft(HyperlinkTooltipBorder(), (locationInDIPs.x() - SwapChainPanel().ActualOffset().x));
-                    OverlayCanvas().SetTop(HyperlinkTooltipBorder(), (locationInDIPs.y() - SwapChainPanel().ActualOffset().y));
-                }
-                _lastHoveredCell = terminalPosition;
-
-                const auto newId = _terminal->GetHyperlinkIdAtPosition(terminalPosition);
-                const auto newInterval = _terminal->GetHyperlinkIntervalFromPosition(terminalPosition);
-                // If the hyperlink ID changed or the interval changed, trigger a redraw all
-                // (so this will happen both when we move onto a link and when we move off a link)
-                if (newId != _lastHoveredId || (newInterval != _lastHoveredInterval))
-                {
-                    _lastHoveredId = newId;
-                    _lastHoveredInterval = newInterval;
-                    _renderEngine->UpdateHyperlinkHoveredId(newId);
-                    _renderer->UpdateLastHoveredInterval(newInterval);
-                    _renderer->TriggerRedrawAll();
-                }
-            }
+            _UpdateHoveredCell(terminalPosition);
         }
         else if (_focused && ptr.PointerDeviceType() == Windows::Devices::Input::PointerDeviceType::Touch && _touchAnchor)
         {
@@ -2881,7 +2850,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
     // - The Microsoft::Terminal::Core::ControlKeyStates representing the modifier key states.
     ControlKeyStates TermControl::_GetPressedModifierKeys() const
     {
-        CoreWindow window = CoreWindow::GetForCurrentThread();
+        const CoreWindow window = CoreWindow::GetForCurrentThread();
         // DONT USE
         //      != CoreVirtualKeyStates::None
         // OR
@@ -3293,6 +3262,74 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         }
     }
 
+    // Method description:
+    // - Updates last hovered cell, renders / removes rendering of hyper-link if required
+    // Arguments:
+    // - terminalPosition: The terminal position of the pointer
+    void TermControl::_UpdateHoveredCell(const std::optional<COORD>& terminalPosition)
+    {
+        if (terminalPosition == _lastHoveredCell)
+        {
+            return;
+        }
+
+        _lastHoveredCell = terminalPosition;
+
+        if (terminalPosition.has_value())
+        {
+            const auto uri = _terminal->GetHyperlinkAtPosition(*terminalPosition);
+            if (!uri.empty())
+            {
+                // Update the tooltip with the URI
+                HoveredUri().Text(uri);
+
+                // Set the border thickness so it covers the entire cell
+                const auto charSizeInPixels = CharacterDimensions();
+                const auto htInDips = charSizeInPixels.Height / SwapChainPanel().CompositionScaleY();
+                const auto wtInDips = charSizeInPixels.Width / SwapChainPanel().CompositionScaleX();
+                const Thickness newThickness{ wtInDips, htInDips, 0, 0 };
+                HyperlinkTooltipBorder().BorderThickness(newThickness);
+
+                // Compute the location of the top left corner of the cell in DIPS
+                const til::size marginsInDips{ til::math::rounding, GetPadding().Left, GetPadding().Top };
+                const til::point startPos{ terminalPosition->X, terminalPosition->Y };
+                const til::size fontSize{ _actualFont.GetSize() };
+                const til::point posInPixels{ startPos * fontSize };
+                const til::point posInDIPs{ posInPixels / SwapChainPanel().CompositionScaleX() };
+                const til::point locationInDIPs{ posInDIPs + marginsInDips };
+
+                // Move the border to the top left corner of the cell
+                OverlayCanvas().SetLeft(HyperlinkTooltipBorder(), (locationInDIPs.x() - SwapChainPanel().ActualOffset().x));
+                OverlayCanvas().SetTop(HyperlinkTooltipBorder(), (locationInDIPs.y() - SwapChainPanel().ActualOffset().y));
+            }
+        }
+
+        const uint16_t newId = terminalPosition.has_value() ? _terminal->GetHyperlinkIdAtPosition(*terminalPosition) : 0u;
+        const auto newInterval = terminalPosition.has_value() ? _terminal->GetHyperlinkIntervalFromPosition(*terminalPosition) : std::nullopt;
+
+        // If the hyperlink ID changed or the interval changed, trigger a redraw all
+        // (so this will happen both when we move onto a link and when we move off a link)
+        if (newId != _lastHoveredId || (newInterval != _lastHoveredInterval))
+        {
+            _lastHoveredId = newId;
+            _lastHoveredInterval = newInterval;
+            _renderEngine->UpdateHyperlinkHoveredId(newId);
+            _renderer->UpdateLastHoveredInterval(newInterval);
+            _renderer->TriggerRedrawAll();
+        }
+    }
+
+    // Method Description:
+    // - Handle a mouse exited event, specifically clearing last hovered cell
+    // and removing selection from hyper link if exists
+    // Arguments:
+    // - sender: not used
+    // - args: event data
+    void TermControl::_PointerExitedHandler(Windows::Foundation::IInspectable const& /*sender*/, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& /*e*/)
+    {
+        _UpdateHoveredCell(std::nullopt);
+    }
+
     // -------------------------------- WinRT Events ---------------------------------
     // Winrt events need a method for adding a callback to the event and removing the callback.
     // These macros will define them both for you.
diff --git a/src/cascadia/TerminalControl/TermControl.h b/src/cascadia/TerminalControl/TermControl.h
index b95daef022c..b1005c9a5d4 100644
--- a/src/cascadia/TerminalControl/TermControl.h
+++ b/src/cascadia/TerminalControl/TermControl.h
@@ -244,7 +244,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         std::optional<winrt::Windows::Foundation::Point> _touchAnchor;
 
         // Track the last cell we hovered over (used in pointerMovedHandler)
-        COORD _lastHoveredCell;
+        std::optional<COORD> _lastHoveredCell;
         // Track the last hyperlink ID we hovered over
         uint16_t _lastHoveredId;
 
@@ -283,6 +283,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         void _PointerPressedHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
         void _PointerMovedHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
         void _PointerReleasedHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
+        void _PointerExitedHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
         void _MouseWheelHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
         void _ScrollbarChangeHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Controls::Primitives::RangeBaseValueChangedEventArgs const& e);
         void _GotFocusHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& e);
@@ -345,6 +346,8 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         winrt::fire_and_forget _AsyncCloseConnection();
 
         winrt::fire_and_forget _RaiseReadOnlyWarning();
+
+        void _UpdateHoveredCell(const std::optional<COORD>& terminalPosition);
     };
 }
 
diff --git a/src/cascadia/TerminalControl/TermControl.xaml b/src/cascadia/TerminalControl/TermControl.xaml
index 969db1e678a..c3d34d0f244 100644
--- a/src/cascadia/TerminalControl/TermControl.xaml
+++ b/src/cascadia/TerminalControl/TermControl.xaml
@@ -45,7 +45,8 @@ the MIT License. See LICENSE in the project root for license information. -->
                   Background="Transparent"
                   PointerPressed="_PointerPressedHandler"
                   PointerMoved="_PointerMovedHandler"
-                  PointerReleased="_PointerReleasedHandler">
+                  PointerReleased="_PointerReleasedHandler"
+                  PointerExited="_PointerExitedHandler">
 
                 <SwapChainPanel x:Name="SwapChainPanel"
                                 SizeChanged="_SwapChainSizeChanged"
diff --git a/src/cascadia/TerminalCore/Terminal.hpp b/src/cascadia/TerminalCore/Terminal.hpp
index dcd64d71c88..7def2cf72a8 100644
--- a/src/cascadia/TerminalCore/Terminal.hpp
+++ b/src/cascadia/TerminalCore/Terminal.hpp
@@ -182,7 +182,7 @@ class Microsoft::Terminal::Core::Terminal final :
     void SelectNewRegion(const COORD coordStart, const COORD coordEnd) override;
     const COORD GetSelectionAnchor() const noexcept override;
     const COORD GetSelectionEnd() const noexcept override;
-    const std::wstring GetConsoleTitle() const noexcept override;
+    const std::wstring_view GetConsoleTitle() const noexcept override;
     void ColorSelection(const COORD coordSelectionStart, const COORD coordSelectionEnd, const TextAttribute) override;
 #pragma endregion
 
diff --git a/src/cascadia/TerminalCore/terminalrenderdata.cpp b/src/cascadia/TerminalCore/terminalrenderdata.cpp
index 212f7c7681f..17b711db748 100644
--- a/src/cascadia/TerminalCore/terminalrenderdata.cpp
+++ b/src/cascadia/TerminalCore/terminalrenderdata.cpp
@@ -215,7 +215,7 @@ void Terminal::SelectNewRegion(const COORD coordStart, const COORD coordEnd)
     SetSelectionEnd(realCoordEnd, SelectionExpansionMode::Cell);
 }
 
-const std::wstring Terminal::GetConsoleTitle() const noexcept
+const std::wstring_view Terminal::GetConsoleTitle() const noexcept
 try
 {
     if (_title.has_value())
diff --git a/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp b/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp
index 37ab687d507..4aa21a1062f 100644
--- a/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp
+++ b/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp
@@ -225,12 +225,14 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     void ColorSchemes::RenameAccept_Click(IInspectable const& /*sender*/, RoutedEventArgs const& /*e*/)
     {
         _RenameCurrentScheme(NameBox().Text());
+        RenameButton().Focus(FocusState::Programmatic);
     }
 
     void ColorSchemes::RenameCancel_Click(IInspectable const& /*sender*/, RoutedEventArgs const& /*e*/)
     {
         IsRenaming(false);
         RenameErrorTip().IsOpen(false);
+        RenameButton().Focus(FocusState::Programmatic);
     }
 
     void ColorSchemes::NameBox_PreviewKeyDown(IInspectable const& /*sender*/, winrt::Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e)
@@ -246,6 +248,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             RenameErrorTip().IsOpen(false);
             e.Handled(true);
         }
+        ColorSchemeComboBox().Focus(FocusState::Programmatic);
     }
 
     void ColorSchemes::_RenameCurrentScheme(hstring newName)
diff --git a/src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml b/src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml
index 0dddeb1069d..f8b76846358 100644
--- a/src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml
+++ b/src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml
@@ -86,6 +86,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                     <!--Rename Button-->
                     <!--Bind IsEnabled to prevent a the color scheme from returning from the dead-->
                     <Button x:Uid="Rename"
+                            x:Name="RenameButton"
                             Style="{StaticResource SmallButtonStyle}"
                             Click="Rename_Click"
                             IsEnabled="{x:Bind CanDeleteCurrentScheme, Mode=OneWay}">
diff --git a/src/cascadia/TerminalSettingsEditor/CommonResources.xaml b/src/cascadia/TerminalSettingsEditor/CommonResources.xaml
index 0dfbee2288c..fed8e83085f 100644
--- a/src/cascadia/TerminalSettingsEditor/CommonResources.xaml
+++ b/src/cascadia/TerminalSettingsEditor/CommonResources.xaml
@@ -65,7 +65,7 @@ the MIT License. See LICENSE in the project root for license information. -->
 
     <!--Button-Related Styling-->
     <Style x:Key="BaseButtonStyle" TargetType="Button" BasedOn="{StaticResource DefaultButtonStyle}">
-        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
     </Style>
 
     <Style x:Key="BrowseButtonStyle" TargetType="Button" BasedOn="{StaticResource BaseButtonStyle}">
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index e09398146aa..435c4a5c9dc 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -51,6 +51,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _InitializeProfilesList();
 
         _colorSchemesNavState = winrt::make<ColorSchemesPageNavigationState>(_settingsClone);
+
+        Automation::AutomationProperties::SetHelpText(SaveButton(), RS_(L"Settings_SaveSettingsButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"));
+        Automation::AutomationProperties::SetHelpText(ResetButton(), RS_(L"Settings_ResetSettingsButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"));
+        Automation::AutomationProperties::SetHelpText(OpenJsonNavItem(), RS_(L"Nav_OpenJSON/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"));
     }
 
     // Method Description:
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.xaml b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
index 239380c834e..37765342f00 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
@@ -35,7 +35,8 @@ the MIT License. See LICENSE in the project root for license information. -->
                          Header="{Binding ElementName=SettingsNav, Path=SelectedItem.Content, Mode=OneWay}"
                          Loaded="SettingsNav_Loaded"
                          ItemInvoked="SettingsNav_ItemInvoked"
-                         IsBackButtonVisible="Collapsed">
+                         IsBackButtonVisible="Collapsed"
+                         TabFocusNavigation="Cycle">
 
         <muxc:NavigationView.MenuItems>
     
@@ -88,6 +89,7 @@ the MIT License. See LICENSE in the project root for license information. -->
         <muxc:NavigationView.PaneFooter>
             <!--The OpenJson item needs both Tapped and KeyDown handler-->
             <muxc:NavigationViewItem x:Uid="Nav_OpenJSON"
+                                     x:Name="OpenJsonNavItem"
                                      Tapped="OpenJsonTapped"
                                      KeyDown="OpenJsonKeyDown">
                 <muxc:NavigationViewItem.Icon>
@@ -118,9 +120,10 @@ the MIT License. See LICENSE in the project root for license information. -->
                            Margin="30,0,0,0"/>
                 <StackPanel VerticalAlignment="Center" HorizontalAlignment="Right" Orientation="Horizontal" Margin="0,0,30,0">
                     <Button x:Uid="Settings_ResetSettingsButton"
-                            ToolTipService.Placement="Mouse"
+                            x:Name="ResetButton"
                             Click="ResetButton_Click"/>
                     <Button x:Uid="Settings_SaveSettingsButton"
+                            x:Name="SaveButton"
                             Style="{StaticResource AccentButtonStyle}"
                             Margin="10,0,0,0"
                             Click="SaveButton_Click"/>
diff --git a/src/cascadia/WindowsTerminal/AppHost.cpp b/src/cascadia/WindowsTerminal/AppHost.cpp
index bc45ea9605a..492a21d1d27 100644
--- a/src/cascadia/WindowsTerminal/AppHost.cpp
+++ b/src/cascadia/WindowsTerminal/AppHost.cpp
@@ -530,6 +530,7 @@ bool AppHost::HasWindow()
 void AppHost::_DispatchCommandline(winrt::Windows::Foundation::IInspectable /*sender*/,
                                    Remoting::CommandlineArgs args)
 {
+    _window->SummonWindow();
     _logic.ExecuteCommandline(args.Commandline(), args.CurrentDirectory());
 }
 
diff --git a/src/cascadia/WindowsTerminal/IslandWindow.cpp b/src/cascadia/WindowsTerminal/IslandWindow.cpp
index ff3a4967e2c..0850f7e08df 100644
--- a/src/cascadia/WindowsTerminal/IslandWindow.cpp
+++ b/src/cascadia/WindowsTerminal/IslandWindow.cpp
@@ -844,5 +844,41 @@ void IslandWindow::_ApplyWindowSize()
                                          SWP_FRAMECHANGED | SWP_NOACTIVATE));
 }
 
+// Method Description:
+// - Force activate this window. This method will bring us to the foreground and
+//   activate us. If the window is minimized, it will restore the window. If the
+//   window is on another desktop, the OS will switch to that desktop.
+// Arguments:
+// - <none>
+// Return Value:
+// - <none>
+winrt::fire_and_forget IslandWindow::SummonWindow()
+{
+    // On the foreground thread:
+    co_await winrt::resume_foreground(_rootGrid.Dispatcher());
+
+    // From: https://stackoverflow.com/a/59659421
+    // > The trick is to make windows ‘think’ that our process and the target
+    // > window (hwnd) are related by attaching the threads (using
+    // > AttachThreadInput API) and using an alternative API: BringWindowToTop.
+    // If the window is minimized, then restore it. We don't want to do this
+    // always though, because if you SW_RESTORE a maximized window, it will
+    // restore-down the window.
+    if (IsIconic(_window.get()))
+    {
+        LOG_IF_WIN32_BOOL_FALSE(ShowWindow(_window.get(), SW_RESTORE));
+    }
+    const DWORD windowThreadProcessId = GetWindowThreadProcessId(GetForegroundWindow(), nullptr);
+    const DWORD currentThreadId = GetCurrentThreadId();
+
+    LOG_IF_WIN32_BOOL_FALSE(AttachThreadInput(windowThreadProcessId, currentThreadId, true));
+    // Just in case, add the thread detach as a scope_exit, to make _sure_ we do it.
+    auto detachThread = wil::scope_exit([windowThreadProcessId, currentThreadId]() {
+        LOG_IF_WIN32_BOOL_FALSE(AttachThreadInput(windowThreadProcessId, currentThreadId, false));
+    });
+    LOG_IF_WIN32_BOOL_FALSE(BringWindowToTop(_window.get()));
+    LOG_IF_WIN32_BOOL_FALSE(ShowWindow(_window.get(), SW_SHOW));
+}
+
 DEFINE_EVENT(IslandWindow, DragRegionClicked, _DragRegionClickedHandlers, winrt::delegate<>);
 DEFINE_EVENT(IslandWindow, WindowCloseButtonClicked, _windowCloseButtonClickedHandler, winrt::delegate<>);
diff --git a/src/cascadia/WindowsTerminal/IslandWindow.h b/src/cascadia/WindowsTerminal/IslandWindow.h
index fe0cae1ec65..f17b81c252e 100644
--- a/src/cascadia/WindowsTerminal/IslandWindow.h
+++ b/src/cascadia/WindowsTerminal/IslandWindow.h
@@ -38,6 +38,8 @@ class IslandWindow :
     void FlashTaskbar();
     void SetTaskbarProgress(const size_t state, const size_t progress);
 
+    winrt::fire_and_forget SummonWindow();
+
 #pragma endregion
 
     DECLARE_EVENT(DragRegionClicked, _DragRegionClickedHandlers, winrt::delegate<>);
diff --git a/src/cascadia/WindowsTerminal/pch.h b/src/cascadia/WindowsTerminal/pch.h
index b416ccccc4f..2a4fb9c4a60 100644
--- a/src/cascadia/WindowsTerminal/pch.h
+++ b/src/cascadia/WindowsTerminal/pch.h
@@ -56,8 +56,10 @@ Module Name:
 #include <windows.ui.xaml.hosting.desktopwindowxamlsource.h>
 
 // Additional headers for various xaml features. We need:
+//  * Core so we can resume_foreground
 //  * Controls for grid
 //  * Media for ScaleTransform
+#include <winrt/Windows.UI.Core.h>
 #include <winrt/Windows.UI.Xaml.Controls.h>
 #include <winrt/Windows.ui.xaml.media.h>
 
diff --git a/src/cascadia/WpfTerminalControl/TerminalContainer.cs b/src/cascadia/WpfTerminalControl/TerminalContainer.cs
index b53a4605b54..369f48778fb 100644
--- a/src/cascadia/WpfTerminalControl/TerminalContainer.cs
+++ b/src/cascadia/WpfTerminalControl/TerminalContainer.cs
@@ -138,7 +138,9 @@ internal void SetTheme(TerminalTheme theme, string fontFamily, short fontSize)
 
             NativeMethods.TerminalSetTheme(this.terminal, theme, fontFamily, fontSize, (int)dpiScale.PixelsPerInchX);
 
-            if (!this.RenderSize.IsEmpty && !this.TerminalControlSize.IsEmpty)
+            // Validate before resizing that we have a non-zero size.
+            if (!this.RenderSize.IsEmpty && !this.TerminalControlSize.IsEmpty
+                && this.TerminalControlSize.Width != 0 && this.TerminalControlSize.Height != 0)
             {
                 this.Resize(this.TerminalControlSize);
             }
@@ -166,7 +168,7 @@ internal void Resize(Size renderSize)
         {
             if (renderSize.Width == 0 || renderSize.Height == 0)
             {
-                throw new ArgumentException(nameof(renderSize), "Terminal column or row count cannot be 0.");
+                throw new ArgumentException("Terminal column or row count cannot be 0.", nameof(renderSize));
             }
 
             NativeMethods.TerminalTriggerResize(
@@ -191,11 +193,11 @@ internal void Resize(uint rows, uint columns)
         {
             if (rows == 0)
             {
-                throw new ArgumentException(nameof(rows), "Terminal row count cannot be 0.");
+                throw new ArgumentException("Terminal row count cannot be 0.", nameof(rows));
             }
             else if (columns == 0)
             {
-                throw new ArgumentException(nameof(columns), "Terminal column count cannot be 0.");
+                throw new ArgumentException("Terminal column count cannot be 0.", nameof(columns));
             }
 
             NativeMethods.SIZE dimensionsInPixels;
diff --git a/src/cascadia/WpfTerminalControl/TerminalControl.xaml.cs b/src/cascadia/WpfTerminalControl/TerminalControl.xaml.cs
index cb8fa0d255b..d5baef5b73f 100644
--- a/src/cascadia/WpfTerminalControl/TerminalControl.xaml.cs
+++ b/src/cascadia/WpfTerminalControl/TerminalControl.xaml.cs
@@ -133,6 +133,11 @@ await this.Dispatcher.BeginInvoke(
             rendersize.Width *= dpiScale.DpiScaleX;
             rendersize.Height *= dpiScale.DpiScaleY;
 
+            if (rendersize.Width == 0 || rendersize.Height == 0)
+            {
+                return (0, 0);
+            }
+
             this.termContainer.Resize(rendersize);
 
             return (this.Rows, this.Columns);
diff --git a/src/host/consoleInformation.cpp b/src/host/consoleInformation.cpp
index 60ad4ff420e..81ef9faa7b5 100644
--- a/src/host/consoleInformation.cpp
+++ b/src/host/consoleInformation.cpp
@@ -24,6 +24,8 @@ CONSOLE_INFORMATION::CONSOLE_INFORMATION() :
     // ExeAliasList initialized below
     _OriginalTitle(),
     _Title(),
+    _Prefix(),
+    _TitleAndPrefix(),
     _LinkTitle(),
     Flags(0),
     PopupCount(0),
@@ -115,7 +117,12 @@ ULONG CONSOLE_INFORMATION::GetCSRecursionCount()
     try
     {
         gci.SetTitle(title);
-        gci.SetOriginalTitle(std::wstring(TranslateConsoleTitle(gci.GetTitle().c_str(), TRUE, FALSE)));
+
+        // TranslateConsoleTitle must have a null terminated string.
+        // This should only happen once on startup so the copy shouldn't be costly
+        // but could be eliminated by rewriting TranslateConsoleTitle.
+        const std::wstring nullTerminatedTitle{ gci.GetTitle() };
+        gci.SetOriginalTitle(std::wstring(TranslateConsoleTitle(nullTerminatedTitle.c_str(), TRUE, FALSE)));
     }
     catch (...)
     {
@@ -269,6 +276,7 @@ std::pair<COLORREF, COLORREF> CONSOLE_INFORMATION::LookupAttributeColors(const T
 void CONSOLE_INFORMATION::SetTitle(const std::wstring_view newTitle)
 {
     _Title = std::wstring{ newTitle.begin(), newTitle.end() };
+    _TitleAndPrefix = _Prefix + _Title;
 
     auto* const pRender = ServiceLocator::LocateGlobals().pRender;
     if (pRender)
@@ -284,9 +292,10 @@ void CONSOLE_INFORMATION::SetTitle(const std::wstring_view newTitle)
 // - newTitlePrefix: The new value to use for the title prefix
 // Return Value:
 // - <none>
-void CONSOLE_INFORMATION::SetTitlePrefix(const std::wstring& newTitlePrefix)
+void CONSOLE_INFORMATION::SetTitlePrefix(const std::wstring_view newTitlePrefix)
 {
-    _TitlePrefix = newTitlePrefix;
+    _Prefix = newTitlePrefix;
+    _TitleAndPrefix = _Prefix + _Title;
 
     auto* const pRender = ServiceLocator::LocateGlobals().pRender;
     if (pRender)
@@ -302,7 +311,7 @@ void CONSOLE_INFORMATION::SetTitlePrefix(const std::wstring& newTitlePrefix)
 // - originalTitle: The new value to use for the console's original title
 // Return Value:
 // - <none>
-void CONSOLE_INFORMATION::SetOriginalTitle(const std::wstring& originalTitle)
+void CONSOLE_INFORMATION::SetOriginalTitle(const std::wstring_view originalTitle)
 {
     _OriginalTitle = originalTitle;
 }
@@ -314,7 +323,7 @@ void CONSOLE_INFORMATION::SetOriginalTitle(const std::wstring& originalTitle)
 // - linkTitle: The new value to use for the console's link title
 // Return Value:
 // - <none>
-void CONSOLE_INFORMATION::SetLinkTitle(const std::wstring& linkTitle)
+void CONSOLE_INFORMATION::SetLinkTitle(const std::wstring_view linkTitle)
 {
     _LinkTitle = linkTitle;
 }
@@ -324,8 +333,8 @@ void CONSOLE_INFORMATION::SetLinkTitle(const std::wstring& linkTitle)
 // Arguments:
 // - <none>
 // Return Value:
-// - a reference to the console's title.
-const std::wstring& CONSOLE_INFORMATION::GetTitle() const noexcept
+// - the console's title.
+const std::wstring_view CONSOLE_INFORMATION::GetTitle() const noexcept
 {
     return _Title;
 }
@@ -336,10 +345,10 @@ const std::wstring& CONSOLE_INFORMATION::GetTitle() const noexcept
 // Arguments:
 // - <none>
 // Return Value:
-// - a new wstring containing the combined prefix and title.
-const std::wstring CONSOLE_INFORMATION::GetTitleAndPrefix() const
+// - the combined prefix and title.
+const std::wstring_view CONSOLE_INFORMATION::GetTitleAndPrefix() const
 {
-    return _TitlePrefix + _Title;
+    return _TitleAndPrefix;
 }
 
 // Method Description:
@@ -347,8 +356,8 @@ const std::wstring CONSOLE_INFORMATION::GetTitleAndPrefix() const
 // Arguments:
 // - <none>
 // Return Value:
-// - a reference to the console's original title.
-const std::wstring& CONSOLE_INFORMATION::GetOriginalTitle() const noexcept
+// - the console's original title.
+const std::wstring_view CONSOLE_INFORMATION::GetOriginalTitle() const noexcept
 {
     return _OriginalTitle;
 }
@@ -358,8 +367,8 @@ const std::wstring& CONSOLE_INFORMATION::GetOriginalTitle() const noexcept
 // Arguments:
 // - <none>
 // Return Value:
-// - a reference to the console's link title.
-const std::wstring& CONSOLE_INFORMATION::GetLinkTitle() const noexcept
+// - the console's link title.
+const std::wstring_view CONSOLE_INFORMATION::GetLinkTitle() const noexcept
 {
     return _LinkTitle;
 }
diff --git a/src/host/getset.cpp b/src/host/getset.cpp
index e380f442cc3..b3ccb9ef7a9 100644
--- a/src/host/getset.cpp
+++ b/src/host/getset.cpp
@@ -1660,33 +1660,21 @@ void DoSrvPrivateRefreshWindow(_In_ const SCREEN_INFORMATION& screenInfo)
         }
 
         // Get the appropriate title and length depending on the mode.
-        const wchar_t* pwszTitle;
-        size_t cchTitleLength;
-
-        if (isOriginal)
-        {
-            pwszTitle = gci.GetOriginalTitle().c_str();
-            cchTitleLength = gci.GetOriginalTitle().length();
-        }
-        else
-        {
-            pwszTitle = gci.GetTitle().c_str();
-            cchTitleLength = gci.GetTitle().length();
-        }
+        const std::wstring_view storedTitle = isOriginal ? gci.GetOriginalTitle() : gci.GetTitle();
 
         // Always report how much space we would need.
-        needed = cchTitleLength;
+        needed = storedTitle.size();
 
         // If we have a pointer to receive the data, then copy it out.
         if (title.has_value())
         {
-            HRESULT const hr = StringCchCopyNW(title->data(), title->size(), pwszTitle, cchTitleLength);
+            HRESULT const hr = StringCchCopyNW(title->data(), title->size(), storedTitle.data(), storedTitle.size());
 
             // Insufficient buffer is allowed. If we return a partial string, that's still OK by historical/compat standards.
             // Just say how much we managed to return.
             if (SUCCEEDED(hr) || STRSAFE_E_INSUFFICIENT_BUFFER == hr)
             {
-                written = std::min(title->size(), cchTitleLength);
+                written = std::min(title->size(), storedTitle.size());
             }
         }
         return S_OK;
diff --git a/src/host/renderData.cpp b/src/host/renderData.cpp
index a777589307b..c860b3da3c8 100644
--- a/src/host/renderData.cpp
+++ b/src/host/renderData.cpp
@@ -318,7 +318,7 @@ const bool RenderData::IsGridLineDrawingAllowed() noexcept
 // - Retrieves the title information to be displayed in the frame/edge of the window
 // Return Value:
 // - String with title information
-const std::wstring RenderData::GetConsoleTitle() const noexcept
+const std::wstring_view RenderData::GetConsoleTitle() const noexcept
 {
     const CONSOLE_INFORMATION& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
     return gci.GetTitleAndPrefix();
diff --git a/src/host/renderData.hpp b/src/host/renderData.hpp
index 78367bdbfd3..9e1e79b0b56 100644
--- a/src/host/renderData.hpp
+++ b/src/host/renderData.hpp
@@ -54,7 +54,7 @@ class RenderData final :
 
     const bool IsGridLineDrawingAllowed() noexcept override;
 
-    const std::wstring GetConsoleTitle() const noexcept override;
+    const std::wstring_view GetConsoleTitle() const noexcept override;
 
     const std::wstring GetHyperlinkUri(uint16_t id) const noexcept override;
     const std::wstring GetHyperlinkCustomId(uint16_t id) const noexcept override;
diff --git a/src/host/server.h b/src/host/server.h
index da408a4f4df..91ea54537bf 100644
--- a/src/host/server.h
+++ b/src/host/server.h
@@ -129,13 +129,13 @@ class CONSOLE_INFORMATION :
     std::pair<COLORREF, COLORREF> LookupAttributeColors(const TextAttribute& attr) const noexcept;
 
     void SetTitle(const std::wstring_view newTitle);
-    void SetTitlePrefix(const std::wstring& newTitlePrefix);
-    void SetOriginalTitle(const std::wstring& originalTitle);
-    void SetLinkTitle(const std::wstring& linkTitle);
-    const std::wstring& GetTitle() const noexcept;
-    const std::wstring& GetOriginalTitle() const noexcept;
-    const std::wstring& GetLinkTitle() const noexcept;
-    const std::wstring GetTitleAndPrefix() const;
+    void SetTitlePrefix(const std::wstring_view newTitlePrefix);
+    void SetOriginalTitle(const std::wstring_view originalTitle);
+    void SetLinkTitle(const std::wstring_view linkTitle);
+    const std::wstring_view GetTitle() const noexcept;
+    const std::wstring_view GetOriginalTitle() const noexcept;
+    const std::wstring_view GetLinkTitle() const noexcept;
+    const std::wstring_view GetTitleAndPrefix() const;
 
     [[nodiscard]] static NTSTATUS AllocateConsole(const std::wstring_view title);
     // MSFT:16886775 : get rid of friends
@@ -152,7 +152,8 @@ class CONSOLE_INFORMATION :
 private:
     CRITICAL_SECTION _csConsoleLock; // serialize input and output using this
     std::wstring _Title;
-    std::wstring _TitlePrefix; // Eg Select, Mark - things that we manually prepend to the title.
+    std::wstring _Prefix; // Eg Select, Mark - things that we manually prepend to the title.
+    std::wstring _TitleAndPrefix;
     std::wstring _OriginalTitle;
     std::wstring _LinkTitle; // Path to .lnk file
     SCREEN_INFORMATION* pCurrentScreenBuffer;
diff --git a/src/host/ut_host/ApiRoutinesTests.cpp b/src/host/ut_host/ApiRoutinesTests.cpp
index 4ce5a6ac0be..bf0f7ed366f 100644
--- a/src/host/ut_host/ApiRoutinesTests.cpp
+++ b/src/host/ut_host/ApiRoutinesTests.cpp
@@ -207,10 +207,12 @@ class ApiRoutinesTests
         CONSOLE_INFORMATION& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
         gci.SetTitle(L"Test window title.");
 
+        const auto title = gci.GetTitle();
+
         int const iBytesNeeded = WideCharToMultiByte(gci.OutputCP,
                                                      0,
-                                                     gci.GetTitle().c_str(),
-                                                     -1,
+                                                     title.data(),
+                                                     gsl::narrow_cast<int>(title.size()),
                                                      nullptr,
                                                      0,
                                                      nullptr,
@@ -221,8 +223,8 @@ class ApiRoutinesTests
 
         VERIFY_WIN32_BOOL_SUCCEEDED(WideCharToMultiByte(gci.OutputCP,
                                                         0,
-                                                        gci.GetTitle().c_str(),
-                                                        -1,
+                                                        title.data(),
+                                                        gsl::narrow_cast<int>(title.size()),
                                                         pszExpected.get(),
                                                         iBytesNeeded,
                                                         nullptr,
@@ -251,10 +253,13 @@ class ApiRoutinesTests
         VERIFY_SUCCEEDED(_pApiRoutines->GetConsoleTitleWImpl(gsl::span<wchar_t>(pwszTitle, ARRAYSIZE(pwszTitle)), cchWritten, cchNeeded));
 
         VERIFY_ARE_NOT_EQUAL(0u, cchWritten);
+
+        const auto title = gci.GetTitle();
+
         // NOTE: W version of API returns string length. A version of API returns buffer length (string + null).
-        VERIFY_ARE_EQUAL(gci.GetTitle().length(), cchWritten);
-        VERIFY_ARE_EQUAL(gci.GetTitle().length(), cchNeeded);
-        VERIFY_ARE_EQUAL(WEX::Common::String(gci.GetTitle().c_str()), WEX::Common::String(pwszTitle));
+        VERIFY_ARE_EQUAL(title.length(), cchWritten);
+        VERIFY_ARE_EQUAL(title.length(), cchNeeded);
+        VERIFY_ARE_EQUAL(WEX::Common::String(title.data(), gsl::narrow_cast<int>(title.size())), WEX::Common::String(pwszTitle));
     }
 
     TEST_METHOD(ApiGetConsoleOriginalTitleA)
@@ -262,10 +267,12 @@ class ApiRoutinesTests
         CONSOLE_INFORMATION& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
         gci.SetOriginalTitle(L"Test original window title.");
 
+        const auto originalTitle = gci.GetOriginalTitle();
+
         int const iBytesNeeded = WideCharToMultiByte(gci.OutputCP,
                                                      0,
-                                                     gci.GetOriginalTitle().c_str(),
-                                                     -1,
+                                                     originalTitle.data(),
+                                                     gsl::narrow_cast<int>(originalTitle.size()),
                                                      nullptr,
                                                      0,
                                                      nullptr,
@@ -276,8 +283,8 @@ class ApiRoutinesTests
 
         VERIFY_WIN32_BOOL_SUCCEEDED(WideCharToMultiByte(gci.OutputCP,
                                                         0,
-                                                        gci.GetOriginalTitle().c_str(),
-                                                        -1,
+                                                        originalTitle.data(),
+                                                        gsl::narrow_cast<int>(originalTitle.size()),
                                                         pszExpected.get(),
                                                         iBytesNeeded,
                                                         nullptr,
@@ -306,10 +313,12 @@ class ApiRoutinesTests
         VERIFY_SUCCEEDED(_pApiRoutines->GetConsoleOriginalTitleWImpl(gsl::span<wchar_t>(pwszTitle, ARRAYSIZE(pwszTitle)), cchWritten, cchNeeded));
 
         VERIFY_ARE_NOT_EQUAL(0u, cchWritten);
+
+        const auto originalTitle = gci.GetOriginalTitle();
         // NOTE: W version of API returns string length. A version of API returns buffer length (string + null).
-        VERIFY_ARE_EQUAL(gci.GetOriginalTitle().length(), cchWritten);
-        VERIFY_ARE_EQUAL(gci.GetOriginalTitle().length(), cchNeeded);
-        VERIFY_ARE_EQUAL(WEX::Common::String(gci.GetOriginalTitle().c_str()), WEX::Common::String(pwszTitle));
+        VERIFY_ARE_EQUAL(originalTitle.length(), cchWritten);
+        VERIFY_ARE_EQUAL(originalTitle.length(), cchNeeded);
+        VERIFY_ARE_EQUAL(WEX::Common::String(originalTitle.data(), gsl::narrow_cast<int>(originalTitle.size())), WEX::Common::String(pwszTitle));
     }
 
     static void s_AdjustOutputWait(const bool fShouldBlock)
diff --git a/src/host/ut_host/VtIoTests.cpp b/src/host/ut_host/VtIoTests.cpp
index 314fea273fd..6497cb6bcaa 100644
--- a/src/host/ut_host/VtIoTests.cpp
+++ b/src/host/ut_host/VtIoTests.cpp
@@ -355,9 +355,9 @@ class MockRenderData : public IRenderData, IUiaData
         return false;
     }
 
-    const std::wstring GetConsoleTitle() const noexcept override
+    const std::wstring_view GetConsoleTitle() const noexcept override
     {
-        return std::wstring{};
+        return std::wstring_view{};
     }
 
     const bool IsSelectionActive() const override
diff --git a/src/inc/til/bitmap.h b/src/inc/til/bitmap.h
index eff5f1f64d3..f4bef68b62c 100644
--- a/src/inc/til/bitmap.h
+++ b/src/inc/til/bitmap.h
@@ -263,7 +263,7 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned"
                 return const_iterator(_bits, _sz, _sz.area());
             }
 
-            const std::vector<til::rectangle, run_allocator_type>& runs() const
+            const gsl::span<const til::rectangle> runs() const
             {
                 // If we don't have cached runs, rebuild.
                 if (!_runs.has_value())
@@ -271,7 +271,7 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned"
                     _runs.emplace(begin(), end());
                 }
 
-                // Return a reference to the runs.
+                // Return the runs.
                 return _runs.value();
             }
 
diff --git a/src/interactivity/onecore/BgfxEngine.cpp b/src/interactivity/onecore/BgfxEngine.cpp
index 74fe40c42af..9a8d03fdefc 100644
--- a/src/interactivity/onecore/BgfxEngine.cpp
+++ b/src/interactivity/onecore/BgfxEngine.cpp
@@ -230,7 +230,7 @@ BgfxEngine::BgfxEngine(PVOID SharedViewBase, LONG DisplayHeight, LONG DisplayWid
     return S_OK;
 }
 
-std::vector<til::rectangle> BgfxEngine::GetDirtyArea()
+[[nodiscard]] HRESULT BgfxEngine::GetDirtyArea(gsl::span<const til::rectangle>& area) noexcept
 {
     SMALL_RECT r;
     r.Bottom = _displayHeight > 0 ? (SHORT)(_displayHeight - 1) : 0;
@@ -238,7 +238,12 @@ std::vector<til::rectangle> BgfxEngine::GetDirtyArea()
     r.Left = 0;
     r.Right = _displayWidth > 0 ? (SHORT)(_displayWidth - 1) : 0;
 
-    return { r };
+    _dirtyArea = r;
+
+    area = { &_dirtyArea,
+             1 };
+
+    return S_OK;
 }
 
 [[nodiscard]] HRESULT BgfxEngine::GetFontSize(_Out_ COORD* const pFontSize) noexcept
@@ -260,7 +265,7 @@ std::vector<til::rectangle> BgfxEngine::GetDirtyArea()
 // - newTitle: the new string to use for the title of the window
 // Return Value:
 // - S_OK
-[[nodiscard]] HRESULT BgfxEngine::_DoUpdateTitle(_In_ const std::wstring& /*newTitle*/) noexcept
+[[nodiscard]] HRESULT BgfxEngine::_DoUpdateTitle(_In_ const std::wstring_view /*newTitle*/) noexcept
 {
     return S_OK;
 }
diff --git a/src/interactivity/onecore/BgfxEngine.hpp b/src/interactivity/onecore/BgfxEngine.hpp
index 282fdd1ec12..542daa6e5d1 100644
--- a/src/interactivity/onecore/BgfxEngine.hpp
+++ b/src/interactivity/onecore/BgfxEngine.hpp
@@ -67,12 +67,12 @@ namespace Microsoft::Console::Render
 
         [[nodiscard]] HRESULT GetProposedFont(const FontInfoDesired& fiFontInfoDesired, FontInfo& fiFontInfo, int const iDpi) noexcept override;
 
-        std::vector<til::rectangle> GetDirtyArea() override;
+        [[nodiscard]] HRESULT GetDirtyArea(gsl::span<const til::rectangle>& area) noexcept override;
         [[nodiscard]] HRESULT GetFontSize(_Out_ COORD* const pFontSize) noexcept override;
         [[nodiscard]] HRESULT IsGlyphWideByFont(const std::wstring_view glyph, _Out_ bool* const pResult) noexcept override;
 
     protected:
-        [[nodiscard]] HRESULT _DoUpdateTitle(_In_ const std::wstring& newTitle) noexcept override;
+        [[nodiscard]] HRESULT _DoUpdateTitle(_In_ const std::wstring_view newTitle) noexcept override;
 
     private:
         ULONG_PTR _sharedViewBase;
@@ -80,6 +80,7 @@ namespace Microsoft::Console::Render
 
         LONG _displayHeight;
         LONG _displayWidth;
+        til::rectangle _dirtyArea;
 
         COORD _fontSize;
 
diff --git a/src/interactivity/win32/window.cpp b/src/interactivity/win32/window.cpp
index e7a7c774db1..e42a4e074de 100644
--- a/src/interactivity/win32/window.cpp
+++ b/src/interactivity/win32/window.cpp
@@ -289,11 +289,17 @@ void Window::_UpdateSystemMetrics() const
             }
         }
 
+        // CreateWindowExW needs a null terminated string, so ensure
+        // title is null terminated in a std::wstring here.
+        // We don't mind the string copy here because making the window
+        // should be infrequent.
+        const std::wstring title{ gci.GetTitle() };
+
         // Attempt to create window
         HWND hWnd = CreateWindowExW(
             CONSOLE_WINDOW_EX_FLAGS,
             CONSOLE_WINDOW_CLASS,
-            gci.GetTitle().c_str(),
+            title.c_str(),
             CONSOLE_WINDOW_FLAGS,
             WI_IsFlagSet(gci.Flags, CONSOLE_AUTO_POSITION) ? CW_USEDEFAULT : rectProposed.left,
             rectProposed.top, // field is ignored if CW_USEDEFAULT was chosen above
diff --git a/src/interactivity/win32/windowproc.cpp b/src/interactivity/win32/windowproc.cpp
index c9075d4c28d..8a14be8a550 100644
--- a/src/interactivity/win32/windowproc.cpp
+++ b/src/interactivity/win32/windowproc.cpp
@@ -687,7 +687,10 @@ using namespace Microsoft::Console::Types;
 
     case CM_UPDATE_TITLE:
     {
-        SetWindowTextW(hWnd, gci.GetTitleAndPrefix().c_str());
+        // SetWindowTextW needs null terminated string so assign view to string.
+        const std::wstring titleAndPrefix{ gci.GetTitleAndPrefix() };
+
+        SetWindowTextW(hWnd, titleAndPrefix.c_str());
         break;
     }
 
diff --git a/src/internal/stubs.cpp b/src/internal/stubs.cpp
index 7969e770d52..ac312a23e71 100644
--- a/src/internal/stubs.cpp
+++ b/src/internal/stubs.cpp
@@ -30,8 +30,7 @@ void EdpPolicy::AuditClipboard(const std::wstring_view /*destinationName*/) noex
     return S_FALSE;
 }
 
-[[nodiscard]]
-HRESULT DefaultApp::CheckDefaultAppPolicy(bool& isEnabled) noexcept
+[[nodiscard]] HRESULT DefaultApp::CheckDefaultAppPolicy(bool& isEnabled) noexcept
 {
     isEnabled = false;
     return S_OK;
diff --git a/src/propslib/DelegationConfig.cpp b/src/propslib/DelegationConfig.cpp
index 50431a8c18a..8ad4698733f 100644
--- a/src/propslib/DelegationConfig.cpp
+++ b/src/propslib/DelegationConfig.cpp
@@ -28,7 +28,6 @@ using namespace ABI::Windows::ApplicationModel::AppExtensions;
 #define DELEGATION_CONSOLE_EXTENSION_NAME L"com.microsoft.windows.console.host"
 #define DELEGATION_TERMINAL_EXTENSION_NAME L"com.microsoft.windows.terminal.host"
 
-
 template<typename T, typename std::enable_if<std::is_base_of<DelegationConfig::DelegationBase, T>::value>::type* = nullptr>
 HRESULT _lookupCatalog(PCWSTR extensionName, std::vector<T>& vec) noexcept
 {
@@ -106,7 +105,7 @@ HRESULT _lookupCatalog(PCWSTR extensionName, std::vector<T>& vec) noexcept
         ComPtr<IInspectable> anotherInspectable;
         RETURN_IF_FAILED(anotherMap->Lookup(HStringReference(L"#text").Get(), &anotherInspectable));
 
-        // But this time that Inspectable is an IPropertyValue, which is a PROPVARIANT in a trenchcoat.
+        // But this time that Inspectable is an IPropertyValue, which is a PROPVARIANT in a trench coat.
         ComPtr<IPropertyValue> propValue;
         RETURN_IF_FAILED(anotherInspectable.As(&propValue));
 
diff --git a/src/renderer/base/RenderEngineBase.cpp b/src/renderer/base/RenderEngineBase.cpp
index 1d0571d2991..9830e487115 100644
--- a/src/renderer/base/RenderEngineBase.cpp
+++ b/src/renderer/base/RenderEngineBase.cpp
@@ -13,7 +13,7 @@ RenderEngineBase::RenderEngineBase() :
 {
 }
 
-HRESULT RenderEngineBase::InvalidateTitle(const std::wstring& proposedTitle) noexcept
+HRESULT RenderEngineBase::InvalidateTitle(const std::wstring_view proposedTitle) noexcept
 {
     if (proposedTitle != _lastFrameTitle)
     {
@@ -23,7 +23,7 @@ HRESULT RenderEngineBase::InvalidateTitle(const std::wstring& proposedTitle) noe
     return S_OK;
 }
 
-HRESULT RenderEngineBase::UpdateTitle(const std::wstring& newTitle) noexcept
+HRESULT RenderEngineBase::UpdateTitle(const std::wstring_view newTitle) noexcept
 {
     HRESULT hr = S_FALSE;
     if (newTitle != _lastFrameTitle)
diff --git a/src/renderer/base/renderer.cpp b/src/renderer/base/renderer.cpp
index 09df6184eae..31a9d2f696d 100644
--- a/src/renderer/base/renderer.cpp
+++ b/src/renderer/base/renderer.cpp
@@ -467,7 +467,7 @@ void Renderer::TriggerCircling()
 // - <none>
 void Renderer::TriggerTitleChange()
 {
-    const std::wstring newTitle = _pData->GetConsoleTitle();
+    const auto newTitle = _pData->GetConsoleTitle();
     for (IRenderEngine* const pEngine : _rgpEngines)
     {
         LOG_IF_FAILED(pEngine->InvalidateTitle(newTitle));
@@ -483,7 +483,7 @@ void Renderer::TriggerTitleChange()
 // - the HRESULT of the underlying engine's UpdateTitle call.
 HRESULT Renderer::_PaintTitle(IRenderEngine* const pEngine)
 {
-    const std::wstring newTitle = _pData->GetConsoleTitle();
+    const auto newTitle = _pData->GetConsoleTitle();
     return pEngine->UpdateTitle(newTitle);
 }
 
@@ -627,9 +627,10 @@ void Renderer::_PaintBufferOutput(_In_ IRenderEngine* const pEngine)
 
     // This is effectively the number of cells on the visible screen that need to be redrawn.
     // The origin is always 0, 0 because it represents the screen itself, not the underlying buffer.
-    const auto dirtyAreas = pEngine->GetDirtyArea();
+    gsl::span<const til::rectangle> dirtyAreas;
+    LOG_IF_FAILED(pEngine->GetDirtyArea(dirtyAreas));
 
-    for (const auto dirtyRect : dirtyAreas)
+    for (const auto& dirtyRect : dirtyAreas)
     {
         auto dirty = Viewport::FromInclusive(dirtyRect);
 
@@ -1044,7 +1045,10 @@ void Renderer::_PaintOverlay(IRenderEngine& engine,
         // Set it up in a Viewport helper structure and trim it the IME viewport to be within the full console viewport.
         Viewport viewConv = Viewport::FromInclusive(srCaView);
 
-        for (SMALL_RECT srDirty : engine.GetDirtyArea())
+        gsl::span<const til::rectangle> dirtyAreas;
+        LOG_IF_FAILED(engine.GetDirtyArea(dirtyAreas));
+
+        for (SMALL_RECT srDirty : dirtyAreas)
         {
             // Dirty is an inclusive rectangle, but oddly enough the IME was an exclusive one, so correct it.
             srDirty.Bottom++;
@@ -1101,13 +1105,14 @@ void Renderer::_PaintSelection(_In_ IRenderEngine* const pEngine)
 {
     try
     {
-        auto dirtyAreas = pEngine->GetDirtyArea();
+        gsl::span<const til::rectangle> dirtyAreas;
+        LOG_IF_FAILED(pEngine->GetDirtyArea(dirtyAreas));
 
         // Get selection rectangles
         const auto rectangles = _GetSelectionRects();
         for (auto rect : rectangles)
         {
-            for (auto dirtyRect : dirtyAreas)
+            for (auto& dirtyRect : dirtyAreas)
             {
                 // Make a copy as `TrimToViewport` will manipulate it and
                 // can destroy it for the next dirtyRect to test against.
diff --git a/src/renderer/dx/DxRenderer.cpp b/src/renderer/dx/DxRenderer.cpp
index 5c5709a0df7..a66d312e9f8 100644
--- a/src/renderer/dx/DxRenderer.cpp
+++ b/src/renderer/dx/DxRenderer.cpp
@@ -66,7 +66,8 @@ using namespace Microsoft::Console::Types;
 DxEngine::DxEngine() :
     RenderEngineBase(),
     _invalidateFullRows{ true },
-    _invalidMap{},
+    _pool{ til::pmr::get_default_resource() },
+    _invalidMap{ &_pool },
     _invalidScroll{},
     _allInvalid{ false },
     _firstFrame{ true },
@@ -2087,13 +2088,16 @@ float DxEngine::GetScaling() const noexcept
 // Routine Description:
 // - Gets the area that we currently believe is dirty within the character cell grid
 // Arguments:
-// - <none>
+// - area - Rectangle describing dirty area in characters.
 // Return Value:
-// - Rectangle describing dirty area in characters.
-[[nodiscard]] std::vector<til::rectangle> DxEngine::GetDirtyArea()
+// - S_OK
+[[nodiscard]] HRESULT DxEngine::GetDirtyArea(gsl::span<const til::rectangle>& area) noexcept
+try
 {
-    return _invalidMap.runs();
+    area = _invalidMap.runs();
+    return S_OK;
 }
+CATCH_RETURN();
 
 // Routine Description:
 // - Gets the current font size
@@ -2141,7 +2145,7 @@ CATCH_RETURN();
 // - newTitle: the new string to use for the title of the window
 // Return Value:
 // - S_OK
-[[nodiscard]] HRESULT DxEngine::_DoUpdateTitle(_In_ const std::wstring& /*newTitle*/) noexcept
+[[nodiscard]] HRESULT DxEngine::_DoUpdateTitle(_In_ const std::wstring_view /*newTitle*/) noexcept
 {
     if (_hwndTarget != INVALID_HANDLE_VALUE)
     {
diff --git a/src/renderer/dx/DxRenderer.hpp b/src/renderer/dx/DxRenderer.hpp
index 5d07702d8c7..344dedec3b7 100644
--- a/src/renderer/dx/DxRenderer.hpp
+++ b/src/renderer/dx/DxRenderer.hpp
@@ -113,7 +113,7 @@ namespace Microsoft::Console::Render
 
         [[nodiscard]] HRESULT GetProposedFont(const FontInfoDesired& fiFontInfoDesired, FontInfo& fiFontInfo, int const iDpi) noexcept override;
 
-        [[nodiscard]] std::vector<til::rectangle> GetDirtyArea() override;
+        [[nodiscard]] HRESULT GetDirtyArea(gsl::span<const til::rectangle>& area) noexcept override;
 
         [[nodiscard]] HRESULT GetFontSize(_Out_ COORD* const pFontSize) noexcept override;
         [[nodiscard]] HRESULT IsGlyphWideByFont(const std::wstring_view glyph, _Out_ bool* const pResult) noexcept override;
@@ -130,7 +130,7 @@ namespace Microsoft::Console::Render
         void UpdateHyperlinkHoveredId(const uint16_t hoveredId) noexcept;
 
     protected:
-        [[nodiscard]] HRESULT _DoUpdateTitle(_In_ const std::wstring& newTitle) noexcept override;
+        [[nodiscard]] HRESULT _DoUpdateTitle(_In_ const std::wstring_view newTitle) noexcept override;
         [[nodiscard]] HRESULT _PaintTerminalEffects() noexcept;
         [[nodiscard]] bool _FullRepaintNeeded() const noexcept;
 
@@ -181,7 +181,8 @@ namespace Microsoft::Console::Render
 
         bool _firstFrame;
         bool _invalidateFullRows;
-        til::bitmap _invalidMap;
+        std::pmr::unsynchronized_pool_resource _pool;
+        til::pmr::bitmap _invalidMap;
         til::point _invalidScroll;
         bool _allInvalid;
 
diff --git a/src/renderer/gdi/gdirenderer.hpp b/src/renderer/gdi/gdirenderer.hpp
index 3be272c185d..3038675efae 100644
--- a/src/renderer/gdi/gdirenderer.hpp
+++ b/src/renderer/gdi/gdirenderer.hpp
@@ -66,12 +66,12 @@ namespace Microsoft::Console::Render
                                               _Out_ FontInfo& Font,
                                               const int iDpi) noexcept override;
 
-        [[nodiscard]] std::vector<til::rectangle> GetDirtyArea() override;
+        [[nodiscard]] HRESULT GetDirtyArea(gsl::span<const til::rectangle>& area) noexcept override;
         [[nodiscard]] HRESULT GetFontSize(_Out_ COORD* const pFontSize) noexcept override;
         [[nodiscard]] HRESULT IsGlyphWideByFont(const std::wstring_view glyph, _Out_ bool* const pResult) noexcept override;
 
     protected:
-        [[nodiscard]] HRESULT _DoUpdateTitle(_In_ const std::wstring& newTitle) noexcept override;
+        [[nodiscard]] HRESULT _DoUpdateTitle(_In_ const std::wstring_view newTitle) noexcept override;
 
     private:
         HWND _hwndTargetWindow;
@@ -82,6 +82,7 @@ namespace Microsoft::Console::Render
 
         bool _fPaintStarted;
 
+        til::rectangle _invalidCharacters;
         PAINTSTRUCT _psInvalidData;
         HDC _hdcMemoryContext;
         bool _isTrueTypeFont;
diff --git a/src/renderer/gdi/math.cpp b/src/renderer/gdi/math.cpp
index 2dfecd04974..a127021ef14 100644
--- a/src/renderer/gdi/math.cpp
+++ b/src/renderer/gdi/math.cpp
@@ -12,18 +12,22 @@ using namespace Microsoft::Console::Render;
 // Routine Description:
 // - Gets the size in characters of the current dirty portion of the frame.
 // Arguments:
-// - <none>
-// Return Value:
-// - The character dimensions of the current dirty area of the frame.
+// - area - The character dimensions of the current dirty area of the frame.
 //      This is an Inclusive rect.
-std::vector<til::rectangle> GdiEngine::GetDirtyArea()
+// Return Value:
+// - S_OK or math failure
+[[nodiscard]] HRESULT GdiEngine::GetDirtyArea(gsl::span<const til::rectangle>& area) noexcept
 {
     RECT rc = _psInvalidData.rcPaint;
 
     SMALL_RECT sr = { 0 };
-    LOG_IF_FAILED(_ScaleByFont(&rc, &sr));
+    RETURN_IF_FAILED(_ScaleByFont(&rc, &sr));
 
-    return { sr };
+    _invalidCharacters = sr;
+
+    area = { &_invalidCharacters, 1 };
+
+    return S_OK;
 }
 
 // Routine Description:
diff --git a/src/renderer/gdi/state.cpp b/src/renderer/gdi/state.cpp
index d6030b597cd..81fba42d6c1 100644
--- a/src/renderer/gdi/state.cpp
+++ b/src/renderer/gdi/state.cpp
@@ -31,6 +31,7 @@ GdiEngine::GdiEngine() :
     _lastBg(INVALID_COLOR),
     _lastFontItalic(false),
     _fPaintStarted(false),
+    _invalidCharacters{},
     _hfont(nullptr),
     _hfontItalic(nullptr),
     _pool{ til::pmr::get_default_resource() }, // It's important the pool is first so it can be given to the others on construction.
@@ -392,7 +393,7 @@ GdiEngine::~GdiEngine()
 // - newTitle: the new string to use for the title of the window
 // Return Value:
 // -  S_OK if PostMessageW succeeded, otherwise E_FAIL
-[[nodiscard]] HRESULT GdiEngine::_DoUpdateTitle(_In_ const std::wstring& /*newTitle*/) noexcept
+[[nodiscard]] HRESULT GdiEngine::_DoUpdateTitle(_In_ const std::wstring_view /*newTitle*/) noexcept
 {
     // the CM_UPDATE_TITLE handler in windowproc will query the updated title.
     return PostMessageW(_hwndTargetWindow, CM_UPDATE_TITLE, 0, (LPARAM) nullptr) ? S_OK : E_FAIL;
diff --git a/src/renderer/inc/IRenderData.hpp b/src/renderer/inc/IRenderData.hpp
index 47da94b8def..56ab872e217 100644
--- a/src/renderer/inc/IRenderData.hpp
+++ b/src/renderer/inc/IRenderData.hpp
@@ -64,7 +64,7 @@ namespace Microsoft::Console::Render
         virtual const std::vector<RenderOverlay> GetOverlays() const noexcept = 0;
 
         virtual const bool IsGridLineDrawingAllowed() noexcept = 0;
-        virtual const std::wstring GetConsoleTitle() const noexcept = 0;
+        virtual const std::wstring_view GetConsoleTitle() const noexcept = 0;
 
         virtual const std::wstring GetHyperlinkUri(uint16_t id) const noexcept = 0;
         virtual const std::wstring GetHyperlinkCustomId(uint16_t id) const noexcept = 0;
diff --git a/src/renderer/inc/IRenderEngine.hpp b/src/renderer/inc/IRenderEngine.hpp
index 0894bb5257d..688df2f79cc 100644
--- a/src/renderer/inc/IRenderEngine.hpp
+++ b/src/renderer/inc/IRenderEngine.hpp
@@ -71,7 +71,7 @@ namespace Microsoft::Console::Render
         [[nodiscard]] virtual HRESULT InvalidateAll() noexcept = 0;
         [[nodiscard]] virtual HRESULT InvalidateCircling(_Out_ bool* const pForcePaint) noexcept = 0;
 
-        [[nodiscard]] virtual HRESULT InvalidateTitle(const std::wstring& proposedTitle) noexcept = 0;
+        [[nodiscard]] virtual HRESULT InvalidateTitle(const std::wstring_view proposedTitle) noexcept = 0;
 
         [[nodiscard]] virtual HRESULT PrepareRenderInfo(const RenderFrameInfo& info) noexcept = 0;
 
@@ -100,10 +100,10 @@ namespace Microsoft::Console::Render
                                                       _Out_ FontInfo& FontInfo,
                                                       const int iDpi) noexcept = 0;
 
-        virtual std::vector<til::rectangle> GetDirtyArea() = 0;
+        [[nodiscard]] virtual HRESULT GetDirtyArea(gsl::span<const til::rectangle>& area) noexcept = 0;
         [[nodiscard]] virtual HRESULT GetFontSize(_Out_ COORD* const pFontSize) noexcept = 0;
         [[nodiscard]] virtual HRESULT IsGlyphWideByFont(const std::wstring_view glyph, _Out_ bool* const pResult) noexcept = 0;
-        [[nodiscard]] virtual HRESULT UpdateTitle(const std::wstring& newTitle) noexcept = 0;
+        [[nodiscard]] virtual HRESULT UpdateTitle(const std::wstring_view newTitle) noexcept = 0;
     };
 
     inline Microsoft::Console::Render::IRenderEngine::~IRenderEngine() {}
diff --git a/src/renderer/inc/RenderEngineBase.hpp b/src/renderer/inc/RenderEngineBase.hpp
index 81b2d7130ee..378a6a56d22 100644
--- a/src/renderer/inc/RenderEngineBase.hpp
+++ b/src/renderer/inc/RenderEngineBase.hpp
@@ -34,9 +34,9 @@ namespace Microsoft::Console::Render
         RenderEngineBase& operator=(RenderEngineBase&&) = default;
 
     public:
-        [[nodiscard]] HRESULT InvalidateTitle(const std::wstring& proposedTitle) noexcept override;
+        [[nodiscard]] HRESULT InvalidateTitle(const std::wstring_view proposedTitle) noexcept override;
 
-        [[nodiscard]] HRESULT UpdateTitle(const std::wstring& newTitle) noexcept override;
+        [[nodiscard]] HRESULT UpdateTitle(const std::wstring_view newTitle) noexcept override;
 
         [[nodiscard]] HRESULT PrepareRenderInfo(const RenderFrameInfo& info) noexcept override;
 
@@ -45,7 +45,7 @@ namespace Microsoft::Console::Render
         void WaitUntilCanRender() noexcept override;
 
     protected:
-        [[nodiscard]] virtual HRESULT _DoUpdateTitle(const std::wstring& newTitle) noexcept = 0;
+        [[nodiscard]] virtual HRESULT _DoUpdateTitle(const std::wstring_view newTitle) noexcept = 0;
 
         bool _titleChanged;
         std::wstring _lastFrameTitle;
diff --git a/src/renderer/uia/UiaRenderer.cpp b/src/renderer/uia/UiaRenderer.cpp
index 124fb5307c4..f3a848fa70b 100644
--- a/src/renderer/uia/UiaRenderer.cpp
+++ b/src/renderer/uia/UiaRenderer.cpp
@@ -427,12 +427,16 @@ CATCH_RETURN();
 // - Gets the area that we currently believe is dirty within the character cell grid
 // - Not currently used by UiaEngine.
 // Arguments:
-// - <none>
+// - area - Rectangle describing dirty area in characters.
 // Return Value:
-// - Rectangle describing dirty area in characters.
-[[nodiscard]] std::vector<til::rectangle> UiaEngine::GetDirtyArea()
+// - S_OK.
+[[nodiscard]] HRESULT UiaEngine::GetDirtyArea(gsl::span<const til::rectangle>& area) noexcept
 {
-    return { Viewport::Empty().ToInclusive() };
+    // Magic static is only valid because any instance of this object has the same behavior.
+    // Use member variable instead if this ever changes.
+    const static til::rectangle empty;
+    area = { &empty, 1 };
+    return S_OK;
 }
 
 // Routine Description:
@@ -465,7 +469,7 @@ CATCH_RETURN();
 // - newTitle: the new string to use for the title of the window
 // Return Value:
 // - S_FALSE
-[[nodiscard]] HRESULT UiaEngine::_DoUpdateTitle(_In_ const std::wstring& /*newTitle*/) noexcept
+[[nodiscard]] HRESULT UiaEngine::_DoUpdateTitle(_In_ const std::wstring_view /*newTitle*/) noexcept
 {
     return S_FALSE;
 }
diff --git a/src/renderer/uia/UiaRenderer.hpp b/src/renderer/uia/UiaRenderer.hpp
index 68c2308504c..23b092c6e9d 100644
--- a/src/renderer/uia/UiaRenderer.hpp
+++ b/src/renderer/uia/UiaRenderer.hpp
@@ -69,12 +69,12 @@ namespace Microsoft::Console::Render
 
         [[nodiscard]] HRESULT GetProposedFont(const FontInfoDesired& fiFontInfoDesired, FontInfo& fiFontInfo, int const iDpi) noexcept override;
 
-        [[nodiscard]] std::vector<til::rectangle> GetDirtyArea() override;
+        [[nodiscard]] HRESULT GetDirtyArea(gsl::span<const til::rectangle>& area) noexcept override;
         [[nodiscard]] HRESULT GetFontSize(_Out_ COORD* const pFontSize) noexcept override;
         [[nodiscard]] HRESULT IsGlyphWideByFont(const std::wstring_view glyph, _Out_ bool* const pResult) noexcept override;
 
     protected:
-        [[nodiscard]] HRESULT _DoUpdateTitle(const std::wstring& newTitle) noexcept override;
+        [[nodiscard]] HRESULT _DoUpdateTitle(const std::wstring_view newTitle) noexcept override;
 
     private:
         bool _isEnabled;
diff --git a/src/renderer/vt/XtermEngine.cpp b/src/renderer/vt/XtermEngine.cpp
index 34101935ab4..a948acd827e 100644
--- a/src/renderer/vt/XtermEngine.cpp
+++ b/src/renderer/vt/XtermEngine.cpp
@@ -57,7 +57,8 @@ XtermEngine::XtermEngine(_In_ wil::unique_hfile hPipe,
     }
     else
     {
-        const auto dirty = GetDirtyArea();
+        gsl::span<const til::rectangle> dirty;
+        RETURN_IF_FAILED(GetDirtyArea(dirty));
 
         // If we have 0 or 1 dirty pieces in the area, set as appropriate.
         Viewport dirtyView = dirty.empty() ? Viewport::Empty() : Viewport::FromInclusive(til::at(dirty, 0));
@@ -540,7 +541,7 @@ CATCH_RETURN();
 // - newTitle: the new string to use for the title of the window
 // Return Value:
 // - S_OK
-[[nodiscard]] HRESULT XtermEngine::_DoUpdateTitle(const std::wstring& newTitle) noexcept
+[[nodiscard]] HRESULT XtermEngine::_DoUpdateTitle(const std::wstring_view newTitle) noexcept
 {
     // inbox telnet uses xterm-ascii as its mode. If we're in ascii mode, don't
     //      do anything, to maintain compatibility.
diff --git a/src/renderer/vt/XtermEngine.hpp b/src/renderer/vt/XtermEngine.hpp
index 9e4680fe642..1dcf2d17349 100644
--- a/src/renderer/vt/XtermEngine.hpp
+++ b/src/renderer/vt/XtermEngine.hpp
@@ -59,7 +59,7 @@ namespace Microsoft::Console::Render
 
         [[nodiscard]] HRESULT _MoveCursor(const COORD coord) noexcept override;
 
-        [[nodiscard]] HRESULT _DoUpdateTitle(const std::wstring& newTitle) noexcept override;
+        [[nodiscard]] HRESULT _DoUpdateTitle(const std::wstring_view newTitle) noexcept override;
 
 #ifdef UNIT_TESTING
         friend class VtRendererTest;
diff --git a/src/renderer/vt/math.cpp b/src/renderer/vt/math.cpp
index cab0c5ec7ee..54834399310 100644
--- a/src/renderer/vt/math.cpp
+++ b/src/renderer/vt/math.cpp
@@ -13,13 +13,14 @@ using namespace Microsoft::Console::Types;
 // Routine Description:
 // - Gets the size in characters of the current dirty portion of the frame.
 // Arguments:
-// - <none>
+// - area - The character dimensions of the current dirty area of the frame.
+//          This is an Inclusive rect.
 // Return Value:
-// - The character dimensions of the current dirty area of the frame.
-//      This is an Inclusive rect.
-std::vector<til::rectangle> VtEngine::GetDirtyArea()
+// - S_OK.
+[[nodiscard]] HRESULT VtEngine::GetDirtyArea(gsl::span<const til::rectangle>& area) noexcept
 {
-    return _invalidMap.runs();
+    area = _invalidMap.runs();
+    return S_OK;
 }
 
 // Routine Description:
diff --git a/src/renderer/vt/paint.cpp b/src/renderer/vt/paint.cpp
index 485adddd625..f8b8a126654 100644
--- a/src/renderer/vt/paint.cpp
+++ b/src/renderer/vt/paint.cpp
@@ -598,7 +598,7 @@ using namespace Microsoft::Console::Types;
 // - newTitle: the new string to use for the title of the window
 // Return Value:
 // - S_OK
-[[nodiscard]] HRESULT VtEngine::_DoUpdateTitle(const std::wstring& /*newTitle*/) noexcept
+[[nodiscard]] HRESULT VtEngine::_DoUpdateTitle(const std::wstring_view /*newTitle*/) noexcept
 {
     return S_OK;
 }
diff --git a/src/renderer/vt/state.cpp b/src/renderer/vt/state.cpp
index 05dab05e153..a324e988b00 100644
--- a/src/renderer/vt/state.cpp
+++ b/src/renderer/vt/state.cpp
@@ -31,7 +31,8 @@ VtEngine::VtEngine(_In_ wil::unique_hfile pipe,
     _hFile(std::move(pipe)),
     _lastTextAttributes(INVALID_COLOR, INVALID_COLOR),
     _lastViewport(initialViewport),
-    _invalidMap(initialViewport.Dimensions()),
+    _pool(til::pmr::get_default_resource()),
+    _invalidMap(initialViewport.Dimensions(), false, &_pool),
     _lastText({ 0 }),
     _scrollDelta({ 0, 0 }),
     _quickReturn(false),
@@ -50,7 +51,10 @@ VtEngine::VtEngine(_In_ wil::unique_hfile pipe,
     _deferredCursorPos{ INVALID_COORDS },
     _inResizeRequest{ false },
     _trace{},
-    _bufferLine{}
+    _bufferLine{},
+    _buffer{},
+    _formatBuffer{},
+    _conversionBuffer{}
 {
 #ifndef UNIT_TESTING
     // When unit testing, we can instantiate a VtEngine without a pipe.
@@ -144,12 +148,8 @@ VtEngine::VtEngine(_In_ wil::unique_hfile pipe,
 // - S_OK or suitable HRESULT error from either conversion or writing pipe.
 [[nodiscard]] HRESULT VtEngine::_WriteTerminalUtf8(const std::wstring_view wstr) noexcept
 {
-    try
-    {
-        const auto converted = ConvertToA(CP_UTF8, wstr);
-        return _Write(converted);
-    }
-    CATCH_RETURN();
+    RETURN_IF_FAILED(til::u16u8(wstr, _conversionBuffer));
+    return _Write(_conversionBuffer);
 }
 
 // Method Description:
diff --git a/src/renderer/vt/tracing.cpp b/src/renderer/vt/tracing.cpp
index ce3ec60bc65..6d3adc53e68 100644
--- a/src/renderer/vt/tracing.cpp
+++ b/src/renderer/vt/tracing.cpp
@@ -145,7 +145,7 @@ void RenderTracing::TraceInvalidateScroll(const til::point scroll) const
 }
 
 void RenderTracing::TraceStartPaint(const bool quickReturn,
-                                    const til::bitmap& invalidMap,
+                                    const til::pmr::bitmap& invalidMap,
                                     const til::rectangle lastViewport,
                                     const til::point scrollDelt,
                                     const bool cursorMoved,
diff --git a/src/renderer/vt/tracing.hpp b/src/renderer/vt/tracing.hpp
index 7d1cc7dfa63..3a7675a7906 100644
--- a/src/renderer/vt/tracing.hpp
+++ b/src/renderer/vt/tracing.hpp
@@ -39,7 +39,7 @@ namespace Microsoft::Console::VirtualTerminal
         void TraceTriggerCircling(const bool newFrame) const;
         void TraceInvalidateScroll(const til::point scroll) const;
         void TraceStartPaint(const bool quickReturn,
-                             const til::bitmap& invalidMap,
+                             const til::pmr::bitmap& invalidMap,
                              const til::rectangle lastViewport,
                              const til::point scrollDelta,
                              const bool cursorMoved,
diff --git a/src/renderer/vt/vtrenderer.hpp b/src/renderer/vt/vtrenderer.hpp
index 9a9c8198875..ad6c36d3515 100644
--- a/src/renderer/vt/vtrenderer.hpp
+++ b/src/renderer/vt/vtrenderer.hpp
@@ -85,7 +85,7 @@ namespace Microsoft::Console::Render
                                               _Out_ FontInfo& Font,
                                               const int iDpi) noexcept override;
 
-        std::vector<til::rectangle> GetDirtyArea() override;
+        [[nodiscard]] HRESULT GetDirtyArea(gsl::span<const til::rectangle>& area) noexcept override;
         [[nodiscard]] HRESULT GetFontSize(_Out_ COORD* const pFontSize) noexcept override;
         [[nodiscard]] HRESULT IsGlyphWideByFont(const std::wstring_view glyph, _Out_ bool* const pResult) noexcept override;
 
@@ -113,12 +113,14 @@ namespace Microsoft::Console::Render
         std::string _buffer;
 
         std::string _formatBuffer;
+        std::string _conversionBuffer;
 
         TextAttribute _lastTextAttributes;
 
         Microsoft::Console::Types::Viewport _lastViewport;
 
-        til::bitmap _invalidMap;
+        std::pmr::unsynchronized_pool_resource _pool;
+        til::pmr::bitmap _invalidMap;
 
         COORD _lastText;
         til::point _scrollDelta;
@@ -222,7 +224,7 @@ namespace Microsoft::Console::Render
         [[nodiscard]] HRESULT _WriteTerminalUtf8(const std::wstring_view str) noexcept;
         [[nodiscard]] HRESULT _WriteTerminalAscii(const std::wstring_view str) noexcept;
 
-        [[nodiscard]] virtual HRESULT _DoUpdateTitle(const std::wstring& newTitle) noexcept override;
+        [[nodiscard]] virtual HRESULT _DoUpdateTitle(const std::wstring_view newTitle) noexcept override;
 
         /////////////////////////// Unit Testing Helpers ///////////////////////////
 #ifdef UNIT_TESTING
diff --git a/src/renderer/wddmcon/WddmConRenderer.cpp b/src/renderer/wddmcon/WddmConRenderer.cpp
index d19aa5250b4..35415e53ca5 100644
--- a/src/renderer/wddmcon/WddmConRenderer.cpp
+++ b/src/renderer/wddmcon/WddmConRenderer.cpp
@@ -353,7 +353,7 @@ bool WddmConEngine::IsInitialized()
     return S_OK;
 }
 
-std::vector<til::rectangle> WddmConEngine::GetDirtyArea()
+[[nodiscard]] HRESULT WddmConEngine::GetDirtyArea(gsl::span<const til::rectangle>& area) noexcept
 {
     SMALL_RECT r;
     r.Bottom = _displayHeight > 0 ? (SHORT)(_displayHeight - 1) : 0;
@@ -361,7 +361,12 @@ std::vector<til::rectangle> WddmConEngine::GetDirtyArea()
     r.Left = 0;
     r.Right = _displayWidth > 0 ? (SHORT)(_displayWidth - 1) : 0;
 
-    return { r };
+    _dirtyArea = r;
+
+    area = { &_dirtyArea,
+             1 };
+
+    return S_OK;
 }
 
 RECT WddmConEngine::GetDisplaySize()
@@ -409,7 +414,7 @@ RECT WddmConEngine::GetDisplaySize()
 // - newTitle: the new string to use for the title of the window
 // Return Value:
 // - S_OK
-[[nodiscard]] HRESULT WddmConEngine::_DoUpdateTitle(_In_ const std::wstring& /*newTitle*/) noexcept
+[[nodiscard]] HRESULT WddmConEngine::_DoUpdateTitle(_In_ const std::wstring_view /*newTitle*/) noexcept
 {
     return S_OK;
 }
diff --git a/src/renderer/wddmcon/WddmConRenderer.hpp b/src/renderer/wddmcon/WddmConRenderer.hpp
index f9ad89b174a..0d142be1b56 100644
--- a/src/renderer/wddmcon/WddmConRenderer.hpp
+++ b/src/renderer/wddmcon/WddmConRenderer.hpp
@@ -59,12 +59,12 @@ namespace Microsoft::Console::Render
 
         [[nodiscard]] HRESULT GetProposedFont(const FontInfoDesired& fiFontInfoDesired, FontInfo& fiFontInfo, int const iDpi) noexcept override;
 
-        std::vector<til::rectangle> GetDirtyArea() override;
+        [[nodiscard]] HRESULT GetDirtyArea(gsl::span<const til::rectangle>& area) noexcept override;
         [[nodiscard]] HRESULT GetFontSize(_Out_ COORD* const pFontSize) noexcept override;
         [[nodiscard]] HRESULT IsGlyphWideByFont(const std::wstring_view glyph, _Out_ bool* const pResult) noexcept override;
 
     protected:
-        [[nodiscard]] HRESULT _DoUpdateTitle(_In_ const std::wstring& newTitle) noexcept override;
+        [[nodiscard]] HRESULT _DoUpdateTitle(_In_ const std::wstring_view newTitle) noexcept override;
 
     private:
         HANDLE _hWddmConCtx;
@@ -75,6 +75,7 @@ namespace Microsoft::Console::Render
         // Variables
         LONG _displayHeight;
         LONG _displayWidth;
+        til::rectangle _dirtyArea;
 
         PCD_IO_ROW_INFORMATION* _displayState;
 
diff --git a/src/server/ConDrvDeviceComm.cpp b/src/server/ConDrvDeviceComm.cpp
index 2598b3eadf4..6d8d2e15077 100644
--- a/src/server/ConDrvDeviceComm.cpp
+++ b/src/server/ConDrvDeviceComm.cpp
@@ -175,7 +175,7 @@ ConDrvDeviceComm::~ConDrvDeviceComm()
 }
 
 // Routine Description:
-// - Provides acccess to the raw server handle so it can be used to hand off
+// - Provides access to the raw server handle so it can be used to hand off
 //   the session to another console host server.
 [[nodiscard]] HRESULT ConDrvDeviceComm::GetServerHandle(_Out_ HANDLE* pHandle) const
 {
diff --git a/src/server/IoDispatchers.cpp b/src/server/IoDispatchers.cpp
index 26fb92b8607..85c8952eb63 100644
--- a/src/server/IoDispatchers.cpp
+++ b/src/server/IoDispatchers.cpp
@@ -165,8 +165,6 @@ PCONSOLE_API_MSG IoDispatchers::ConsoleHandleConnectionRequest(_In_ PCONSOLE_API
         goto Error;
     }
 
-    
-
     // If we are NOT a PTY session (headless)...
     // we have FOUND a CLSID for a different console to be the default startup handler...
     // we are NOT already receiving an inbound console connection handoff...
diff --git a/src/server/lib/server.vcxproj b/src/server/lib/server.vcxproj
index ec7ec05432c..4ceafacd986 100644
--- a/src/server/lib/server.vcxproj
+++ b/src/server/lib/server.vcxproj
@@ -58,13 +58,13 @@
     <ClInclude Include="..\WinNTControl.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\host\dll\Host.DLL.vcxproj">
+    <ProjectReference Include="..\..\host\proxy\Host.Proxy.vcxproj">
       <Project>{e437b604-3e98-4f40-a927-e173e818ea4b}</Project>
     </ProjectReference>
   </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-        <AdditionalIncludeDirectories>$(IntDir)..\Host.ProxyDll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+        <AdditionalIncludeDirectories>$(IntDir)..\OpenConsoleProxy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->