diff --git a/build/MicroCom.targets b/build/MicroCom.targets
index b48e377fd4..49d2cdce72 100644
--- a/build/MicroCom.targets
+++ b/build/MicroCom.targets
@@ -15,7 +15,8 @@
           Inputs="@(AvnComIdl);$(MSBuildThisFileDirectory)../src/tools/MicroComGenerator/**/*.cs"
           Outputs="%(AvnComIdl.OutputFile)">
     <Message Importance="high" Text="Generating file %(AvnComIdl.OutputFile) from @(AvnComIdl)" />
-    <Exec Command="dotnet $(MSBuildThisFileDirectory)../src/tools/MicroComGenerator/bin/$(Configuration)/netcoreapp3.1/MicroComGenerator.dll -i @(AvnComIdl) --cs %(AvnComIdl.OutputFile)" LogStandardErrorAsError="true" />
+    <Exec Command="dotnet &quot;$(MSBuildThisFileDirectory)../src/tools/MicroComGenerator/bin/$(Configuration)/netcoreapp3.1/MicroComGenerator.dll&quot; -i @(AvnComIdl) --cs %(AvnComIdl.OutputFile)" 
+          LogStandardErrorAsError="true" />
     <ItemGroup>
       <!-- Remove and re-add generated file, this is needed for the clean build -->
       <Compile Remove="%(AvnComIdl.OutputFile)"/>
diff --git a/native/Avalonia.Native/src/OSX/KeyTransform.mm b/native/Avalonia.Native/src/OSX/KeyTransform.mm
index 6b7d95b619..4817ad0ccf 100644
--- a/native/Avalonia.Native/src/OSX/KeyTransform.mm
+++ b/native/Avalonia.Native/src/OSX/KeyTransform.mm
@@ -222,6 +222,7 @@ std::map<int, const char*> s_QwertyKeyMap =
     { 45, "n" },
     { 46, "m" },
     { 47, "." },
+    { 48, "\t" },
     { 49, " " },
     { 50, "`" },
     { 51, "" },
diff --git a/native/Avalonia.Native/src/OSX/app.mm b/native/Avalonia.Native/src/OSX/app.mm
index 460c24ea3a..e1972b22f4 100644
--- a/native/Avalonia.Native/src/OSX/app.mm
+++ b/native/Avalonia.Native/src/OSX/app.mm
@@ -50,6 +50,12 @@ ComPtr<IAvnApplicationEvents> _events;
     
     _events->FilesOpened(array);
 }
+
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
+{
+    return _events->TryShutdown() ? NSTerminateNow : NSTerminateCancel;
+}
+
 @end
 
 @interface AvnApplication : NSApplication
diff --git a/native/Avalonia.Native/src/OSX/window.h b/native/Avalonia.Native/src/OSX/window.h
index b1f64bca88..3a54bd4b79 100644
--- a/native/Avalonia.Native/src/OSX/window.h
+++ b/native/Avalonia.Native/src/OSX/window.h
@@ -10,6 +10,8 @@ class WindowBaseImpl;
 -(void) setSwRenderedFrame: (AvnFramebuffer* _Nonnull) fb dispose: (IUnknown* _Nonnull) dispose;
 -(void) onClosed;
 -(AvnPixelSize) getPixelSize;
+-(AvnPlatformResizeReason) getResizeReason;
+-(void) setResizeReason:(AvnPlatformResizeReason)reason;
 @end
 
 @interface AutoFitContentView : NSView
@@ -34,6 +36,7 @@ class WindowBaseImpl;
 -(double) getScaling;
 -(double) getExtendedTitleBarHeight;
 -(void) setIsExtended:(bool)value;
+-(bool) isDialog;
 @end
 
 struct INSWindowHolder
@@ -50,4 +53,23 @@ struct IWindowStateChanged
     virtual AvnWindowState WindowState () = 0;
 };
 
+class ResizeScope
+{
+public:
+    ResizeScope(AvnView* _Nonnull view, AvnPlatformResizeReason reason)
+    {
+        _view = view;
+        _restore = [view getResizeReason];
+        [view setResizeReason:reason];
+    }
+    
+    ~ResizeScope()
+    {
+        [_view setResizeReason:_restore];
+    }
+private:
+    AvnView* _Nonnull _view;
+    AvnPlatformResizeReason _restore;
+};
+
 #endif /* window_h */
diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
index 4be1419f78..14fe60ab0b 100644
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@@ -29,10 +29,12 @@ public:
     IAvnMenu* _mainMenu;
     
     bool _shown;
+    bool _inResize;
     
     WindowBaseImpl(IAvnWindowBaseEvents* events, IAvnGlContext* gl)
     {
         _shown = false;
+        _inResize = false;
         _mainMenu = nullptr;
         BaseEvents = events;
         _glContext = gl;
@@ -50,6 +52,7 @@ public:
         [Window setBackingType:NSBackingStoreBuffered];
         
         [Window setOpaque:false];
+        [Window setContentView: StandardContainer];
     }
     
     virtual HRESULT ObtainNSWindowHandle(void** ret) override
@@ -113,7 +116,7 @@ public:
         return Window;
     }
     
-    virtual HRESULT Show(bool activate) override
+    virtual HRESULT Show(bool activate, bool isDialog) override
     {
         START_COM_CALL;
         
@@ -122,7 +125,6 @@ public:
             SetPosition(lastPositionSet);
             UpdateStyle();
             
-            [Window setContentView: StandardContainer];
             [Window setTitle:_lastTitle];
             
             if(ShouldTakeFocusOnShow() && activate)
@@ -275,9 +277,17 @@ public:
         }
     }
     
-    virtual HRESULT Resize(double x, double y) override
+    virtual HRESULT Resize(double x, double y, AvnPlatformResizeReason reason) override
     {
+        if(_inResize)
+        {
+            return S_OK;
+        }
+        
+        _inResize = true;
+        
         START_COM_CALL;
+        auto resizeBlock = ResizeScope(View, reason);
         
         @autoreleasepool
         {
@@ -304,13 +314,19 @@ public:
                 y = maxSize.height;
             }
             
-            if(!_shown)
+            @try
             {
-                BaseEvents->Resized(AvnSize{x,y});
+                if(!_shown)
+                {
+                    BaseEvents->Resized(AvnSize{x,y}, reason);
+                }
+                
+                [Window setContentSize:NSSize{x, y}];
+            }
+            @finally
+            {
+                _inResize = false;
             }
-            
-            [StandardContainer setFrameSize:NSSize{x,y}];
-            [Window setContentSize:NSSize{x, y}];
             
             return S_OK;
         }
@@ -562,6 +578,11 @@ public:
         return S_OK;
     }
 
+    virtual bool IsDialog()
+    {
+        return false;
+    }
+    
 protected:
     virtual NSWindowStyleMask GetStyle()
     {
@@ -592,6 +613,7 @@ private:
     NSRect _preZoomSize;
     bool _transitioningWindowState;
     bool _isClientAreaExtended;
+    bool _isDialog;
     AvnExtendClientAreaChromeHints _extendClientHints;
     
     FORWARD_IUNKNOWN()
@@ -652,13 +674,14 @@ private:
         }
     }
     
-    virtual HRESULT Show (bool activate) override
+    virtual HRESULT Show (bool activate, bool isDialog) override
     {
         START_COM_CALL;
         
         @autoreleasepool
         {
-            WindowBaseImpl::Show(activate);
+            _isDialog = isDialog;
+            WindowBaseImpl::Show(activate, isDialog);
             
             HideOrShowTrafficLights();
             
@@ -690,6 +713,12 @@ private:
             if(cparent == nullptr)
                 return E_INVALIDARG;
             
+            // If one tries to show a child window with a minimized parent window, then the parent window will be
+            // restored but MacOS isn't kind enough to *tell* us that, so the window will be left in a non-interactive
+            // state. Detect this and explicitly restore the parent window ourselves to avoid this situation.
+            if (cparent->WindowState() == Minimized)
+                cparent->SetWindowState(Normal);
+            
             [cparent->Window addChildWindow:Window ordered:NSWindowAbove];
             
             UpdateStyle();
@@ -757,6 +786,7 @@ private:
                 }
                 
                 _lastWindowState = state;
+                _actualWindowState = state;
                 WindowEvents->WindowStateChanged(state);
             }
         }
@@ -1180,6 +1210,7 @@ private:
                 }
                 
                 _actualWindowState = _lastWindowState;
+                WindowEvents->WindowStateChanged(_actualWindowState);
             }
             
             
@@ -1197,6 +1228,11 @@ private:
         }
     }
     
+    virtual bool IsDialog() override
+    {
+        return _isDialog;
+    }
+    
 protected:
     virtual NSWindowStyleMask GetStyle() override
     {
@@ -1276,6 +1312,9 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     [_blurBehind setWantsLayer:true];
     _blurBehind.hidden = true;
     
+    [_blurBehind setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+    [_content setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+    
     [self addSubview:_blurBehind];
     [self addSubview:_content];
     
@@ -1311,9 +1350,6 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     _settingSize = true;
     [super setFrameSize:newSize];
     
-    [_blurBehind setFrameSize:newSize];
-    [_content setFrameSize:newSize];
-    
     auto window = objc_cast<AvnWindow>([self window]);
     
     // TODO get actual titlebar size
@@ -1329,6 +1365,7 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     [_titleBarMaterial setFrame:tbar];
     tbar.size.height = height < 1 ? 0 : 1;
     [_titleBarUnderline setFrame:tbar];
+
     _settingSize = false;
 }
 
@@ -1356,6 +1393,7 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     bool _lastKeyHandled;
     AvnPixelSize _lastPixelSize;
     NSObject<IRenderTarget>* _renderTarget;
+    AvnPlatformResizeReason _resizeReason;
 }
 
 - (void)onClosed
@@ -1467,7 +1505,8 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
         _lastPixelSize.Height = (int)fsize.height;
         [self updateRenderTarget];
     
-        _parent->BaseEvents->Resized(AvnSize{newSize.width, newSize.height});
+        auto reason = [self inLiveResize] ? ResizeUser : _resizeReason;
+        _parent->BaseEvents->Resized(AvnSize{newSize.width, newSize.height}, reason);
     }
 }
 
@@ -1966,6 +2005,16 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     
 }
 
+- (AvnPlatformResizeReason)getResizeReason
+{
+    return _resizeReason;
+}
+
+- (void)setResizeReason:(AvnPlatformResizeReason)reason
+{
+    _resizeReason = reason;
+}
+
 @end
 
 
@@ -1985,6 +2034,11 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     _isExtended = value;
 }
 
+-(bool) isDialog
+{
+    return _parent->IsDialog();
+}
+
 -(double) getScaling
 {
     return _lastScaling;
@@ -2014,18 +2068,7 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
 
 +(void)closeAll
 {
-    NSArray<NSWindow*>* windows = [NSArray arrayWithArray:[NSApp windows]];
-    auto numWindows = [windows count];
-    
-    for(int i = 0; i < numWindows; i++)
-    {
-        auto window = (AvnWindow*)[windows objectAtIndex:i];
-        
-        if([window parentWindow] == nullptr) // Avalonia will handle the child windows.
-        {
-            [window performClose:nil];
-        }
-    }
+    [[NSApplication sharedApplication] terminate:self];
 }
 
 - (void)performClose:(id)sender
@@ -2174,7 +2217,22 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
 
 -(BOOL)canBecomeKeyWindow
 {
-    return _canBecomeKeyAndMain;
+    if (_canBecomeKeyAndMain)
+    {
+        // If the window has a child window being shown as a dialog then don't allow it to become the key window.
+        for(NSWindow* uch in [self childWindows])
+        {
+            auto ch = objc_cast<AvnWindow>(uch);
+            if(ch == nil)
+                continue;
+            if (ch.isDialog)
+                return false;
+        }
+        
+        return true;
+    }
+    
+    return false;
 }
 
 -(BOOL)canBecomeMainWindow
@@ -2182,22 +2240,6 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     return _canBecomeKeyAndMain;
 }
 
--(bool) activateAppropriateChild: (bool)activating
-{
-    for(NSWindow* uch in [self childWindows])
-    {
-        auto ch = objc_cast<AvnWindow>(uch);
-        if(ch == nil)
-            continue;
-        [ch activateAppropriateChild:false];
-        return FALSE;
-    }
-    
-    if(!activating)
-        [self makeKeyAndOrderFront:self];
-    return TRUE;
-}
-
 -(bool)shouldTryToHandleEvents
 {
     return _isEnabled;
@@ -2208,26 +2250,15 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     _isEnabled = enable;
 }
 
--(void)makeKeyWindow
-{
-    if([self activateAppropriateChild: true])
-    {
-        [super makeKeyWindow];
-    }
-}
-
 -(void)becomeKeyWindow
 {
     [self showWindowMenuWithAppMenu];
     
-    if([self activateAppropriateChild: true])
+    if(_parent != nullptr)
     {
-        if(_parent != nullptr)
-        {
-            _parent->BaseEvents->Activated();
-        }
+        _parent->BaseEvents->Activated();
     }
-    
+
     [super becomeKeyWindow];
 }
 
@@ -2237,7 +2268,6 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     if(parent != nil)
     {
         [parent removeChildWindow:self];
-        [parent activateAppropriateChild: false];
     }
 }
 
@@ -2372,13 +2402,14 @@ protected:
         return NSWindowStyleMaskBorderless;
     }
     
-    virtual HRESULT Resize(double x, double y) override
+    virtual HRESULT Resize(double x, double y, AvnPlatformResizeReason reason) override
     {
+        START_COM_CALL;
+        
         @autoreleasepool
         {
             if (Window != nullptr)
             {
-                [StandardContainer setFrameSize:NSSize{x,y}];
                 [Window setContentSize:NSSize{x, y}];
             
                 [Window setFrameTopLeftPoint:ToNSPoint(ConvertPointY(lastPositionSet))];
diff --git a/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml b/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml
deleted file mode 100644
index f0e079ad91..0000000000
--- a/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml
+++ /dev/null
@@ -1,102 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="ControlCatalog.Pages.ContextFlyoutPage">
-    <UserControl.Styles>
-        <Style Selector="FlyoutPresenter.NoPadding">
-            <Setter Property="Padding" Value="0" />
-        </Style>
-    </UserControl.Styles>
-    
-    <StackPanel Orientation="Vertical" Spacing="4">
-        <TextBlock Classes="h1">Context Flyout</TextBlock>
-        <TextBlock Classes="h2">A right click Flyout that can be applied to any control.</TextBlock>
-
-        <StackPanel Orientation="Horizontal"
-              Margin="0,16,0,0"
-              HorizontalAlignment="Center"
-              Spacing="16">
-            <Border Background="{DynamicResource SystemAccentColor}"
-                    Margin="16"
-                    Padding="48,48,48,48">
-                <Border.ContextFlyout>
-                    <MenuFlyout>
-                        <MenuItem Header="Standard _Menu Item" InputGesture="Ctrl+A" />
-                        <MenuItem Header="_Disabled Menu Item" IsEnabled="False" InputGesture="Ctrl+D" />
-                        <Separator/>
-                        <MenuItem Header="Menu with _Submenu">
-                            <MenuItem Header="Submenu _1"/>
-                            <MenuItem Header="Submenu _2"/>
-                        </MenuItem>
-                        <MenuItem Header="Menu Item with _Icon" InputGesture="Ctrl+Shift+B">
-                            <MenuItem.Icon>
-                                <Image Source="/Assets/github_icon.png"/>
-                            </MenuItem.Icon>
-                        </MenuItem>
-                        <MenuItem Header="Menu Item with _Checkbox">
-                            <MenuItem.Icon>
-                                <CheckBox BorderThickness="0" IsHitTestVisible="False" IsChecked="True"/>
-                            </MenuItem.Icon>
-                        </MenuItem>
-                    </MenuFlyout>
-                </Border.ContextFlyout>
-                <TextBlock Text="Defined in XAML"/>
-            </Border>
-            <Border Background="{DynamicResource SystemAccentColor}"
-                    Margin="16"
-                    Padding="48,48,48,48">
-                <Border.ContextMenu>
-                    <ContextMenu Items="{Binding MenuItems}">
-                        <ContextMenu.Styles>
-                            <Style Selector="MenuItem">
-                                <Setter Property="Header" Value="{Binding Header}"/>
-                                <Setter Property="Items" Value="{Binding Items}"/>
-                                <Setter Property="Command" Value="{Binding Command}"/>
-                                <Setter Property="CommandParameter" Value="{Binding CommandParameter}"/>
-                            </Style>
-                        </ContextMenu.Styles>
-                    </ContextMenu>
-                </Border.ContextMenu>
-                <TextBlock Text="Dynamically Generated"/>
-            </Border>
-        </StackPanel>
-
-        <TextBlock Text="Custom ContextFlyout for TextBox" />
-
-        <TextBox Name="TextBox" Width="150" HorizontalAlignment="Center" ContextMenu="{x:Null}">
-            <TextBox.ContextFlyout>
-                <Flyout FlyoutPresenterClasses="NoPadding">
-                    <StackPanel Orientation="Horizontal">
-                        <StackPanel.Styles>
-                            <Style Selector="Button">
-                                <Setter Property="Background" Value="Transparent" />
-                                <Setter Property="Height" Value="40" />
-                                <Setter Property="Width" Value="40" />
-                                <Setter Property="VerticalContentAlignment" Value="Center" />
-                            </Style>
-                            <Style Selector="Button:disabled /template/ ContentPresenter#PART_ContentPresenter">
-                                <Setter Property="Background" Value="Transparent" />
-                                <Setter Property="Opacity" Value="0.5" />
-                            </Style>
-                        </StackPanel.Styles>
-                        <Button Name="CutButton" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}">
-                            <PathIcon Width="14" Height="14" Data="M5.22774,2.08072 C5.43359778,1.94704 5.7011484,1.98419259 5.86368634,2.15675215 L5.91939,2.22774 L12.5191,12.3904 C12.956,12.1419 13.4614,12.0000019 14,12.0000019 C15.6569,12.0000019 17,13.3431 17,15.0000019 C17,16.6569 15.6569,18.0000019 14,18.0000019 C12.3431,18.0000019 11,16.6569 11,15.0000019 C11,14.3201402 11.226152,13.693011 11.6073785,13.1899092 L11.7401,13.0269 L10,10.3474 L8.25991,13.0269 C8.72078,13.5543 9,14.2446 9,15.0000019 C9,16.6569 7.65685,18.0000019 6,18.0000019 C4.34315,18.0000019 3,16.6569 3,15.0000019 C3,13.3431 4.34315,12.0000019 6,12.0000019 C6.46163143,12.0000019 6.89890041,12.1042536 7.28955831,12.2905296 L7.4809,12.3904 L9.40382,9.42936 L5.08072,2.77238 C4.93033,2.54079 4.99615,2.23112 5.22774,2.08072 Z M14,13 C12.8954,13 12,13.8954 12,15 C12,16.1046 12.8954,17 14,17 C15.1046,17 16,16.1046 16,15 C16,13.8954 15.1046,13 14,13 Z M6,13 C4.89543,13 4,13.8954 4,15 C4,16.1046 4.89543,17 6,17 C7.10457,17 8,16.1046 8,15 C8,13.8954 7.10457,13 6,13 Z M14.7723,2.08072 C15.0039,2.23112 15.0697,2.54079 14.9193,2.77238 L11.1924,8.51133 L10.5962,7.59329 L14.0806,2.22774 C14.231,1.99615 14.5407,1.93033 14.7723,2.08072 Z" />
-                        </Button>
-                        <Button Name="CopyButton" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}">
-                            <PathIcon Width="14" Height="14" Data="M5.50280381,4.62704038 L5.5,6.75 L5.5,17.2542087 C5.5,19.0491342 6.95507456,20.5042087 8.75,20.5042087 L17.3662868,20.5044622 C17.057338,21.3782241 16.2239751,22.0042087 15.2444057,22.0042087 L8.75,22.0042087 C6.12664744,22.0042087 4,19.8775613 4,17.2542087 L4,6.75 C4,5.76928848 4.62744523,4.93512464 5.50280381,4.62704038 Z M17.75,2 C18.9926407,2 20,3.00735931 20,4.25 L20,17.25 C20,18.4926407 18.9926407,19.5 17.75,19.5 L8.75,19.5 C7.50735931,19.5 6.5,18.4926407 6.5,17.25 L6.5,4.25 C6.5,3.00735931 7.50735931,2 8.75,2 L17.75,2 Z M17.75,3.5 L8.75,3.5 C8.33578644,3.5 8,3.83578644 8,4.25 L8,17.25 C8,17.6642136 8.33578644,18 8.75,18 L17.75,18 C18.1642136,18 18.5,17.6642136 18.5,17.25 L18.5,4.25 C18.5,3.83578644 18.1642136,3.5 17.75,3.5 Z" />
-                        </Button>
-                        <Button Name="PasteButton" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}">
-                            <PathIcon Width="14" Height="14" Data="M13.75,2 C14.940864,2 15.9156449,2.92516159 15.9948092,4.09595119 L16,4.25 L16,4.25 C16,4.16530567 15.9953205,4.0817043 15.9862059,3.99944035 L17.75,4 C18.9926407,4 20,5.00735931 20,6.25 L20,19.75 C20,20.9926407 18.9926407,22 17.75,22 L6.25,22 C5.00735931,22 4,20.9926407 4,19.75 L4,6.25 C4,5.00735931 5.00735931,4 6.25,4 L8.01379413,3.99944035 C8.00733496,4.05773764 8.00310309,4.11670658 8.00118552,4.17626017 L8,4.25 C8,3.00735931 9.00735931,2 10.25,2 L13.75,2 Z M13.75,6.5 L10.25,6.5 C9.45594921,6.5 8.75796956,6.08867052 8.357512,5.4674625 L8.37902077,5.50019943 L8.37902077,5.50019943 L6.25,5.5 C5.83578644,5.5 5.5,5.83578644 5.5,6.25 L5.5,19.75 C5.5,20.1642136 5.83578644,20.5 6.25,20.5 L17.75,20.5 C18.1642136,20.5 18.5,20.1642136 18.5,19.75 L18.5,6.25 C18.5,5.83578644 18.1642136,5.5 17.75,5.5 L15.6209792,5.50019943 L15.642488,5.4674625 C15.2420304,6.08867052 14.5440508,6.5 13.75,6.5 Z M13.75,3.5 L10.25,3.5 C9.83578644,3.5 9.5,3.83578644 9.5,4.25 C9.5,4.66421356 9.83578644,5 10.25,5 L13.75,5 C14.1642136,5 14.5,4.66421356 14.5,4.25 C14.5,3.83578644 14.1642136,3.5 13.75,3.5 Z" />
-                        </Button>
-                        <Button Name="ClearButton" Command="{Binding $parent[TextBox].Clear}">
-                            <PathIcon Width="14" Height="14" Data="M3.52499419,3.71761187 L3.61611652,3.61611652 C4.0717282,3.16050485 4.79154862,3.13013074 5.28238813,3.52499419 L5.38388348,3.61611652 L14,12.233 L22.6161165,3.61611652 C23.1042719,3.12796116 23.8957281,3.12796116 24.3838835,3.61611652 C24.8720388,4.10427189 24.8720388,4.89572811 24.3838835,5.38388348 L15.767,14 L24.3838835,22.6161165 C24.8394952,23.0717282 24.8698693,23.7915486 24.4750058,24.2823881 L24.3838835,24.3838835 C23.9282718,24.8394952 23.2084514,24.8698693 22.7176119,24.4750058 L22.6161165,24.3838835 L14,15.767 L5.38388348,24.3838835 C4.89572811,24.8720388 4.10427189,24.8720388 3.61611652,24.3838835 C3.12796116,23.8957281 3.12796116,23.1042719 3.61611652,22.6161165 L12.233,14 L3.61611652,5.38388348 C3.16050485,4.9282718 3.13013074,4.20845138 3.52499419,3.71761187 L3.61611652,3.61611652 L3.52499419,3.71761187 Z" />
-                        </Button>
-                    </StackPanel>
-                </Flyout>
-            </TextBox.ContextFlyout>
-        </TextBox>
-    
-    </StackPanel>
-</UserControl>
diff --git a/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml.cs b/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml.cs
deleted file mode 100644
index e64d4a2cdd..0000000000
--- a/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using ControlCatalog.ViewModels;
-using Avalonia.Interactivity;
-namespace ControlCatalog.Pages
-{
-    public class ContextFlyoutPage : UserControl
-    {
-        private TextBox _textBox;
-
-        public ContextFlyoutPage()
-        {
-            InitializeComponent();
-
-            var vm = new ContextFlyoutPageViewModel();
-            vm.View = this;
-            DataContext = vm;
-
-            _textBox = this.FindControl<TextBox>("TextBox");
-
-            var cutButton = this.FindControl<Button>("CutButton");
-            cutButton.Click += CloseFlyout;
-
-            var copyButton = this.FindControl<Button>("CopyButton");
-            copyButton.Click += CloseFlyout;
-
-            var pasteButton = this.FindControl<Button>("PasteButton");
-            pasteButton.Click += CloseFlyout;
-
-            var clearButton = this.FindControl<Button>("ClearButton");
-            clearButton.Click += CloseFlyout;
-        }
-
-        private void CloseFlyout(object sender, RoutedEventArgs e)
-        {
-            _textBox.ContextFlyout.Hide();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-    }
-}
diff --git a/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml b/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml
new file mode 100644
index 0000000000..0d9026bdd5
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml
@@ -0,0 +1,157 @@
+<UserControl x:Class="ControlCatalog.Pages.ContextFlyoutPage"
+             xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             d:DesignHeight="450"
+             d:DesignWidth="800"
+             mc:Ignorable="d">
+  <UserControl.Styles>
+    <Style Selector="FlyoutPresenter.NoPadding">
+      <Setter Property="Padding" Value="0" />
+    </Style>
+  </UserControl.Styles>
+
+  <StackPanel Orientation="Vertical" Spacing="4">
+    <StackPanel.Styles>
+      <Style Selector="Border.context-target">
+        <Setter Property="Padding" Value="48,20" />
+        <Setter Property="Margin" Value="8" />
+        <Setter Property="Focusable" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
+      </Style>
+      <Style Selector="Border.context-target > :is(Control)">
+        <Setter Property="VerticalAlignment" Value="Center" />
+      </Style>
+    </StackPanel.Styles>
+    <TextBlock Classes="h1">Context Flyout</TextBlock>
+    <TextBlock Classes="h2">A right click Flyout that can be applied to any control.</TextBlock>
+
+    <UniformGrid HorizontalAlignment="Center" Rows="2">
+      <Border Classes="context-target">
+        <Border.ContextFlyout>
+          <MenuFlyout>
+            <MenuItem Header="Standard _Menu Item" InputGesture="Ctrl+A" />
+            <MenuItem Header="_Disabled Menu Item"
+                      InputGesture="Ctrl+D"
+                      IsEnabled="False" />
+            <Separator />
+            <MenuItem Header="Menu with _Submenu">
+              <MenuItem Header="Submenu _1" />
+              <MenuItem Header="Submenu _2" />
+            </MenuItem>
+            <MenuItem Header="Menu Item with _Icon" InputGesture="Ctrl+Shift+B">
+              <MenuItem.Icon>
+                <Image Source="/Assets/github_icon.png" />
+              </MenuItem.Icon>
+            </MenuItem>
+            <MenuItem Header="Menu Item with _Checkbox">
+              <MenuItem.Icon>
+                <CheckBox BorderThickness="0"
+                          IsChecked="True"
+                          IsHitTestVisible="False" />
+              </MenuItem.Icon>
+            </MenuItem>
+          </MenuFlyout>
+        </Border.ContextFlyout>
+        <TextBlock Text="Defined in XAML" />
+      </Border>
+      <Border Classes="context-target">
+        <Border.Styles>
+          <Style Selector="MenuFlyoutPresenter MenuItem">
+            <Setter Property="Header" Value="{Binding Header}"/>
+            <Setter Property="Items" Value="{Binding Items}"/>
+            <Setter Property="Command" Value="{Binding Command}"/>
+            <Setter Property="CommandParameter" Value="{Binding CommandParameter}"/>
+          </Style>
+        </Border.Styles>
+        <Border.ContextFlyout>
+          <MenuFlyout Items="{Binding MenuItems}" />
+        </Border.ContextFlyout>
+        <TextBlock Text="Dynamically Generated"/>
+      </Border>
+      <Border x:Name="CustomContextRequestedBorder"
+              Classes="context-target">
+        <Border.ContextFlyout>
+          <Flyout Content="Should never be visible" />
+        </Border.ContextFlyout>
+        <TextBlock Text="Custom ContextRequested handler" TextWrapping="Wrap" />
+      </Border>
+      <Border x:Name="CancellableContextBorder"
+              Classes="context-target">
+        <Border.ContextFlyout>
+          <Flyout>
+            <CheckBox x:Name="CancelCloseCheckBox" Content="Cancel close" />
+          </Flyout>
+        </Border.ContextFlyout>
+        <StackPanel>
+          <TextBlock Text="Cancellable" />
+          <CheckBox x:Name="CancelOpenCheckBox" Content="Cancel open" />
+        </StackPanel>
+      </Border>
+    </UniformGrid>
+
+    <TextBlock Text="Custom ContextFlyout for TextBox" />
+
+    <TextBox Name="TextBox"
+             Width="150"
+             HorizontalAlignment="Center"
+             ContextMenu="{x:Null}">
+      <TextBox.ContextFlyout>
+        <Flyout FlyoutPresenterClasses="NoPadding">
+          <StackPanel>
+          <StackPanel Orientation="Horizontal">
+            <StackPanel.Styles>
+              <Style Selector="Button">
+                <Setter Property="Background" Value="Transparent" />
+                <Setter Property="Height" Value="40" />
+                <Setter Property="Width" Value="40" />
+                <Setter Property="VerticalContentAlignment" Value="Center" />
+              </Style>
+              <Style Selector="Button:disabled /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="Background" Value="Transparent" />
+                <Setter Property="Opacity" Value="0.5" />
+              </Style>
+            </StackPanel.Styles>
+            <Button Name="CutButton"
+                    Command="{Binding $parent[TextBox].Cut}"
+                    IsEnabled="{Binding $parent[TextBox].CanCut}">
+              <PathIcon Width="14"
+                        Height="14"
+                        Data="M5.22774,2.08072 C5.43359778,1.94704 5.7011484,1.98419259 5.86368634,2.15675215 L5.91939,2.22774 L12.5191,12.3904 C12.956,12.1419 13.4614,12.0000019 14,12.0000019 C15.6569,12.0000019 17,13.3431 17,15.0000019 C17,16.6569 15.6569,18.0000019 14,18.0000019 C12.3431,18.0000019 11,16.6569 11,15.0000019 C11,14.3201402 11.226152,13.693011 11.6073785,13.1899092 L11.7401,13.0269 L10,10.3474 L8.25991,13.0269 C8.72078,13.5543 9,14.2446 9,15.0000019 C9,16.6569 7.65685,18.0000019 6,18.0000019 C4.34315,18.0000019 3,16.6569 3,15.0000019 C3,13.3431 4.34315,12.0000019 6,12.0000019 C6.46163143,12.0000019 6.89890041,12.1042536 7.28955831,12.2905296 L7.4809,12.3904 L9.40382,9.42936 L5.08072,2.77238 C4.93033,2.54079 4.99615,2.23112 5.22774,2.08072 Z M14,13 C12.8954,13 12,13.8954 12,15 C12,16.1046 12.8954,17 14,17 C15.1046,17 16,16.1046 16,15 C16,13.8954 15.1046,13 14,13 Z M6,13 C4.89543,13 4,13.8954 4,15 C4,16.1046 4.89543,17 6,17 C7.10457,17 8,16.1046 8,15 C8,13.8954 7.10457,13 6,13 Z M14.7723,2.08072 C15.0039,2.23112 15.0697,2.54079 14.9193,2.77238 L11.1924,8.51133 L10.5962,7.59329 L14.0806,2.22774 C14.231,1.99615 14.5407,1.93033 14.7723,2.08072 Z" />
+            </Button>
+            <Button Name="CopyButton"
+                    Command="{Binding $parent[TextBox].Copy}"
+                    IsEnabled="{Binding $parent[TextBox].CanCopy}">
+              <PathIcon Width="14"
+                        Height="14"
+                        Data="M5.50280381,4.62704038 L5.5,6.75 L5.5,17.2542087 C5.5,19.0491342 6.95507456,20.5042087 8.75,20.5042087 L17.3662868,20.5044622 C17.057338,21.3782241 16.2239751,22.0042087 15.2444057,22.0042087 L8.75,22.0042087 C6.12664744,22.0042087 4,19.8775613 4,17.2542087 L4,6.75 C4,5.76928848 4.62744523,4.93512464 5.50280381,4.62704038 Z M17.75,2 C18.9926407,2 20,3.00735931 20,4.25 L20,17.25 C20,18.4926407 18.9926407,19.5 17.75,19.5 L8.75,19.5 C7.50735931,19.5 6.5,18.4926407 6.5,17.25 L6.5,4.25 C6.5,3.00735931 7.50735931,2 8.75,2 L17.75,2 Z M17.75,3.5 L8.75,3.5 C8.33578644,3.5 8,3.83578644 8,4.25 L8,17.25 C8,17.6642136 8.33578644,18 8.75,18 L17.75,18 C18.1642136,18 18.5,17.6642136 18.5,17.25 L18.5,4.25 C18.5,3.83578644 18.1642136,3.5 17.75,3.5 Z" />
+            </Button>
+            <Button Name="PasteButton"
+                    Command="{Binding $parent[TextBox].Paste}"
+                    IsEnabled="{Binding $parent[TextBox].CanPaste}">
+              <PathIcon Width="14"
+                        Height="14"
+                        Data="M13.75,2 C14.940864,2 15.9156449,2.92516159 15.9948092,4.09595119 L16,4.25 L16,4.25 C16,4.16530567 15.9953205,4.0817043 15.9862059,3.99944035 L17.75,4 C18.9926407,4 20,5.00735931 20,6.25 L20,19.75 C20,20.9926407 18.9926407,22 17.75,22 L6.25,22 C5.00735931,22 4,20.9926407 4,19.75 L4,6.25 C4,5.00735931 5.00735931,4 6.25,4 L8.01379413,3.99944035 C8.00733496,4.05773764 8.00310309,4.11670658 8.00118552,4.17626017 L8,4.25 C8,3.00735931 9.00735931,2 10.25,2 L13.75,2 Z M13.75,6.5 L10.25,6.5 C9.45594921,6.5 8.75796956,6.08867052 8.357512,5.4674625 L8.37902077,5.50019943 L8.37902077,5.50019943 L6.25,5.5 C5.83578644,5.5 5.5,5.83578644 5.5,6.25 L5.5,19.75 C5.5,20.1642136 5.83578644,20.5 6.25,20.5 L17.75,20.5 C18.1642136,20.5 18.5,20.1642136 18.5,19.75 L18.5,6.25 C18.5,5.83578644 18.1642136,5.5 17.75,5.5 L15.6209792,5.50019943 L15.642488,5.4674625 C15.2420304,6.08867052 14.5440508,6.5 13.75,6.5 Z M13.75,3.5 L10.25,3.5 C9.83578644,3.5 9.5,3.83578644 9.5,4.25 C9.5,4.66421356 9.83578644,5 10.25,5 L13.75,5 C14.1642136,5 14.5,4.66421356 14.5,4.25 C14.5,3.83578644 14.1642136,3.5 13.75,3.5 Z" />
+            </Button>
+            <Button Name="ClearButton" Command="{Binding $parent[TextBox].Clear}">
+              <PathIcon Width="14"
+                        Height="14"
+                        Data="M3.52499419,3.71761187 L3.61611652,3.61611652 C4.0717282,3.16050485 4.79154862,3.13013074 5.28238813,3.52499419 L5.38388348,3.61611652 L14,12.233 L22.6161165,3.61611652 C23.1042719,3.12796116 23.8957281,3.12796116 24.3838835,3.61611652 C24.8720388,4.10427189 24.8720388,4.89572811 24.3838835,5.38388348 L15.767,14 L24.3838835,22.6161165 C24.8394952,23.0717282 24.8698693,23.7915486 24.4750058,24.2823881 L24.3838835,24.3838835 C23.9282718,24.8394952 23.2084514,24.8698693 22.7176119,24.4750058 L22.6161165,24.3838835 L14,15.767 L5.38388348,24.3838835 C4.89572811,24.8720388 4.10427189,24.8720388 3.61611652,24.3838835 C3.12796116,23.8957281 3.12796116,23.1042719 3.61611652,22.6161165 L12.233,14 L3.61611652,5.38388348 C3.16050485,4.9282718 3.13013074,4.20845138 3.52499419,3.71761187 L3.61611652,3.61611652 L3.52499419,3.71761187 Z" />
+            </Button>
+          </StackPanel>
+            <Border Classes="context-target"
+                    Padding="4, 20">
+              <Border.ContextFlyout>
+                <Flyout>
+                  <TextBlock>Hello world</TextBlock>
+                </Flyout>
+              </Border.ContextFlyout>
+              <TextBlock>Inner context flyout</TextBlock>
+            </Border>
+          </StackPanel>
+        </Flyout>
+      </TextBox.ContextFlyout>
+    </TextBox>
+  </StackPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml.cs b/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml.cs
new file mode 100644
index 0000000000..10f9ee1de8
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml.cs
@@ -0,0 +1,91 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using ControlCatalog.ViewModels;
+using Avalonia.Interactivity;
+using System;
+using System.ComponentModel;
+
+namespace ControlCatalog.Pages
+{
+    public class ContextFlyoutPage : UserControl
+    {
+        private TextBox _textBox;
+
+        public ContextFlyoutPage()
+        {
+            InitializeComponent();
+
+            DataContext = new ContextPageViewModel();
+
+            _textBox = this.FindControl<TextBox>("TextBox");
+
+            var cutButton = this.FindControl<Button>("CutButton");
+            cutButton.Click += CloseFlyout;
+
+            var copyButton = this.FindControl<Button>("CopyButton");
+            copyButton.Click += CloseFlyout;
+
+            var pasteButton = this.FindControl<Button>("PasteButton");
+            pasteButton.Click += CloseFlyout;
+
+            var clearButton = this.FindControl<Button>("ClearButton");
+            clearButton.Click += CloseFlyout;
+
+            var customContextRequestedBorder = this.FindControl<Border>("CustomContextRequestedBorder");
+            customContextRequestedBorder.AddHandler(ContextRequestedEvent, CustomContextRequested, RoutingStrategies.Tunnel);
+
+            var cancellableContextBorder = this.FindControl<Border>("CancellableContextBorder");
+            cancellableContextBorder.ContextFlyout!.Closing += ContextFlyoutPage_Closing;
+            cancellableContextBorder.ContextFlyout!.Opening += ContextFlyoutPage_Opening;
+        }
+
+        private ContextPageViewModel _model;
+        protected override void OnDataContextChanged(EventArgs e)
+        {
+            if (_model != null)
+                _model.View = null;
+            _model = DataContext as ContextPageViewModel;
+            if (_model != null)
+                _model.View = this;
+
+            base.OnDataContextChanged(e);
+        }
+
+        private void ContextFlyoutPage_Closing(object sender, CancelEventArgs e)
+        {
+            var cancelCloseCheckBox = this.FindControl<CheckBox>("CancelCloseCheckBox");
+            e.Cancel = cancelCloseCheckBox.IsChecked ?? false;
+        }
+
+        private void ContextFlyoutPage_Opening(object sender, EventArgs e)
+        {
+            if (e is CancelEventArgs cancelArgs)
+            {
+                var cancelCloseCheckBox = this.FindControl<CheckBox>("CancelOpenCheckBox");
+                cancelArgs.Cancel = cancelCloseCheckBox.IsChecked ?? false;
+            }
+        }
+
+        private void CloseFlyout(object sender, RoutedEventArgs e)
+        {
+            _textBox.ContextFlyout.Hide();
+        }
+
+        public void CustomContextRequested(object sender, ContextRequestedEventArgs e)
+        {
+            var border = (Border)sender;
+            var textBlock = (TextBlock)border.Child;
+
+            textBlock.Text = e.TryGetPosition(border, out var point)
+                ? $"Context was requested with pointer at: {point.X:N0}, {point.Y:N0}"
+                : "Context was requested without pointer";
+            e.Handled = true;
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/ContextMenuPage.xaml b/samples/ControlCatalog/Pages/ContextMenuPage.xaml
index 25f305151d..7e564efafc 100644
--- a/samples/ControlCatalog/Pages/ContextMenuPage.xaml
+++ b/samples/ControlCatalog/Pages/ContextMenuPage.xaml
@@ -1,58 +1,88 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.ContextMenuPage">
-    <StackPanel Orientation="Vertical" Spacing="4">
-        <TextBlock Classes="h1">Context Menu</TextBlock>
-        <TextBlock Classes="h2">A right click menu that can be applied to any control.</TextBlock>
+<UserControl x:Class="ControlCatalog.Pages.ContextMenuPage"
+             xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <StackPanel Orientation="Vertical" Spacing="4">
+    <TextBlock Classes="h1">Context Menu</TextBlock>
+    <TextBlock Classes="h2">A right click menu that can be applied to any control.</TextBlock>
 
-        <StackPanel Orientation="Horizontal"
-              Margin="0,16,0,0"
-              HorizontalAlignment="Center"
-              Spacing="16">
-            <Border Background="{DynamicResource SystemAccentColor}"
-                    Margin="16"
-                    Padding="48,48,48,48">
-                <Border.ContextMenu>
-                    <ContextMenu>
-                        <MenuItem Header="Standard _Menu Item" InputGesture="Ctrl+A" />
-                        <MenuItem Header="_Disabled Menu Item" IsEnabled="False" InputGesture="Ctrl+D" />
-                        <Separator/>
-                        <MenuItem Header="Menu with _Submenu">
-                            <MenuItem Header="Submenu _1"/>
-                            <MenuItem Header="Submenu _2"/>
-                        </MenuItem>
-                        <MenuItem Header="Menu Item with _Icon" InputGesture="Ctrl+Shift+B">
-                            <MenuItem.Icon>
-                                <Image Source="/Assets/github_icon.png"/>
-                            </MenuItem.Icon>
-                        </MenuItem>
-                        <MenuItem Header="Menu Item with _Checkbox">
-                            <MenuItem.Icon>
-                                <CheckBox BorderThickness="0" IsHitTestVisible="False" IsChecked="True"/>
-                            </MenuItem.Icon>
-                        </MenuItem>
-                        <MenuItem Header="Menu Item that won't close on click" StaysOpenOnClick="True" />
-                    </ContextMenu>
-                </Border.ContextMenu>
-                <TextBlock Text="Defined in XAML"/>
-            </Border>
-            <Border Background="{DynamicResource SystemAccentColor}"
-                    Margin="16"
-                    Padding="48,48,48,48">
-                <Border.ContextMenu>
-                    <ContextMenu Items="{Binding MenuItems}">
-                        <ContextMenu.Styles>
-                            <Style Selector="MenuItem">
-                                <Setter Property="Header" Value="{Binding Header}"/>
-                                <Setter Property="Items" Value="{Binding Items}"/>
-                                <Setter Property="Command" Value="{Binding Command}"/>
-                                <Setter Property="CommandParameter" Value="{Binding CommandParameter}"/>
-                            </Style>
-                        </ContextMenu.Styles>
-                    </ContextMenu>
-                </Border.ContextMenu>
-                <TextBlock Text="Dynamically Generated"/>
-            </Border>
+    <UniformGrid HorizontalAlignment="Center" Rows="2">
+      <UniformGrid.Styles>
+        <Style Selector="UniformGrid > Border">
+          <Setter Property="Padding" Value="48,20" />
+          <Setter Property="Margin" Value="8" />
+          <Setter Property="Focusable" Value="True" />
+          <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
+        </Style>
+        <Style Selector="UniformGrid > Border > :is(Control)">
+          <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+      </UniformGrid.Styles>
+      <Border>
+        <Border.ContextMenu>
+          <ContextMenu>
+            <MenuItem Header="Standard _Menu Item" InputGesture="Ctrl+A" />
+            <MenuItem Header="_Disabled Menu Item"
+                      InputGesture="Ctrl+D"
+                      IsEnabled="False" />
+            <Separator />
+            <MenuItem Header="Menu with _Submenu">
+              <MenuItem Header="Submenu _1" />
+              <MenuItem Header="Submenu _2" />
+            </MenuItem>
+            <MenuItem Header="Menu Item with _Icon" InputGesture="Ctrl+Shift+B">
+              <MenuItem.Icon>
+                <Image Source="/Assets/github_icon.png" />
+              </MenuItem.Icon>
+            </MenuItem>
+            <MenuItem Header="Menu Item with _Checkbox">
+              <MenuItem.Icon>
+                <CheckBox BorderThickness="0"
+                          IsChecked="True"
+                          IsHitTestVisible="False" />
+              </MenuItem.Icon>
+            </MenuItem>
+            <MenuItem Header="Menu Item that won't close on click" StaysOpenOnClick="True" />
+          </ContextMenu>
+        </Border.ContextMenu>
+        <TextBlock Text="Defined in XAML" />
+      </Border>
+      <Border>
+        <Border.Styles>
+          <Style Selector="ContextMenu MenuItem">
+            <Setter Property="Header" Value="{Binding Header}"/>
+            <Setter Property="Items" Value="{Binding Items}"/>
+            <Setter Property="Command" Value="{Binding Command}"/>
+            <Setter Property="CommandParameter" Value="{Binding CommandParameter}"/>
+          </Style>
+        </Border.Styles>
+        <Border.ContextMenu>
+          <ContextMenu Items="{Binding MenuItems}" />
+        </Border.ContextMenu>
+        <TextBlock Text="Dynamically Generated"/>
+      </Border>
+      <Border x:Name="CustomContextRequestedBorder">
+        <Border.ContextMenu>
+          <ContextMenu>
+            <MenuItem Header="Should never be visible" />
+          </ContextMenu>
+        </Border.ContextMenu>
+        <TextBlock Text="Custom ContextRequested handler" TextWrapping="Wrap" />
+      </Border>
+      <Border x:Name="CancellableContextBorder">
+        <Border.ContextMenu>
+          <ContextMenu>
+            <MenuItem>
+              <MenuItem.Header>
+                <CheckBox x:Name="CancelCloseCheckBox" Content="Cancel close" />
+              </MenuItem.Header>
+            </MenuItem>
+          </ContextMenu>
+        </Border.ContextMenu>
+        <StackPanel>
+          <TextBlock Text="Cancellable" />
+          <CheckBox x:Name="CancelOpenCheckBox" Content="Cancel open" />
         </StackPanel>
-    </StackPanel>
+      </Border>
+    </UniformGrid>
+  </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/ContextMenuPage.xaml.cs b/samples/ControlCatalog/Pages/ContextMenuPage.xaml.cs
index f861bfab33..da016e9a75 100644
--- a/samples/ControlCatalog/Pages/ContextMenuPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ContextMenuPage.xaml.cs
@@ -1,5 +1,8 @@
 using System;
+using System.ComponentModel;
+
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using ControlCatalog.ViewModels;
 
@@ -10,21 +13,54 @@ namespace ControlCatalog.Pages
         public ContextMenuPage()
         {
             this.InitializeComponent();
-            DataContext = new ContextMenuPageViewModel();
+            DataContext = new ContextPageViewModel();
+
+            var customContextRequestedBorder = this.FindControl<Border>("CustomContextRequestedBorder");
+            customContextRequestedBorder.AddHandler(ContextRequestedEvent, CustomContextRequested, RoutingStrategies.Tunnel);
+
+            var cancellableContextBorder = this.FindControl<Border>("CancellableContextBorder");
+            cancellableContextBorder.ContextMenu!.ContextMenuClosing += ContextFlyoutPage_Closing;
+            cancellableContextBorder.ContextMenu!.ContextMenuOpening += ContextFlyoutPage_Opening;
         }
 
-        private ContextMenuPageViewModel _model;
+        private ContextPageViewModel _model;
         protected override void OnDataContextChanged(EventArgs e)
         {
             if (_model != null)
                 _model.View = null;
-            _model  = DataContext as ContextMenuPageViewModel;
+            _model  = DataContext as ContextPageViewModel;
             if (_model != null)
                 _model.View = this;
 
             base.OnDataContextChanged(e);
         }
 
+        private void ContextFlyoutPage_Closing(object sender, CancelEventArgs e)
+        {
+            var cancelCloseCheckBox = this.FindControl<CheckBox>("CancelCloseCheckBox");
+            e.Cancel = cancelCloseCheckBox.IsChecked ?? false;
+        }
+
+        private void ContextFlyoutPage_Opening(object sender, EventArgs e)
+        {
+            if (e is CancelEventArgs cancelArgs)
+            {
+                var cancelCloseCheckBox = this.FindControl<CheckBox>("CancelOpenCheckBox");
+                cancelArgs.Cancel = cancelCloseCheckBox.IsChecked ?? false;
+            }
+        }
+
+        public void CustomContextRequested(object sender, ContextRequestedEventArgs e)
+        {
+            var border = (Border)sender;
+            var textBlock = (TextBlock)border.Child;
+
+            textBlock.Text = e.TryGetPosition(border, out var point)
+                ? $"Context was requested with pointer at: {point.X:N0}, {point.Y:N0}"
+                : "Context was requested without pointer";
+            e.Handled = true;
+        }
+
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
diff --git a/samples/ControlCatalog/Pages/DataGridPage.xaml b/samples/ControlCatalog/Pages/DataGridPage.xaml
index 323eaa3463..340b3376f5 100644
--- a/samples/ControlCatalog/Pages/DataGridPage.xaml
+++ b/samples/ControlCatalog/Pages/DataGridPage.xaml
@@ -23,16 +23,21 @@
     </StackPanel>
     <TabControl Grid.Row="2">
       <TabItem Header="DataGrid">
-        <DataGrid Name="dataGrid1" Margin="12" CanUserResizeColumns="True" CanUserReorderColumns="True" CanUserSortColumns="True" HeadersVisibility="All">
-          <DataGrid.Columns>
-            <DataGridTextColumn Header="Country" Binding="{Binding Name}" Width="6*" />
-            <!-- CompiledBinding example of usage. -->
-            <DataGridTextColumn Header="Region" Binding="{CompiledBinding Region}" Width="4*" x:DataType="local:Country" />
-            <DataGridTextColumn Header="Population" Binding="{Binding Population}" Width="3*" />
-            <DataGridTextColumn Header="Area" Binding="{Binding Area}" Width="3*" />
-            <DataGridTextColumn Header="GDP" Binding="{Binding GDP}" Width="3*" CellStyleClasses="gdp" />
-          </DataGrid.Columns>
-        </DataGrid>
+        <DockPanel>
+          <CheckBox x:Name="ShowGDP"  IsChecked="True"  Content="Toggle GDP Column Visibility"
+                    DockPanel.Dock="Top"/>
+          <DataGrid Name="dataGrid1" Margin="12" CanUserResizeColumns="True" CanUserReorderColumns="True" CanUserSortColumns="True" HeadersVisibility="All">
+            <DataGrid.Columns>
+              <DataGridTextColumn Header="Country" Binding="{Binding Name}" Width="6*" MinWidth="400"  />
+              <!-- CompiledBinding example of usage. -->
+              <DataGridTextColumn Header="Region" Binding="{CompiledBinding Region}" Width="4*" x:DataType="local:Country" />
+              <DataGridTextColumn Header="Population" Binding="{Binding Population}" Width="3*" />
+              <DataGridTextColumn Header="Area" Binding="{Binding Area}" Width="3*" />
+              <DataGridTextColumn Header="GDP" Binding="{Binding GDP}" Width="3*" CellStyleClasses="gdp"
+                                  IsVisible="{Binding #ShowGDP.IsChecked}"/>
+            </DataGrid.Columns>
+          </DataGrid>
+        </DockPanel>
       </TabItem>
       <TabItem Header="Grouping">
         <DataGrid Name="dataGridGrouping" Margin="12">
diff --git a/samples/ControlCatalog/SideBar.xaml b/samples/ControlCatalog/SideBar.xaml
index 7c911e91e9..2b5215a3fe 100644
--- a/samples/ControlCatalog/SideBar.xaml
+++ b/samples/ControlCatalog/SideBar.xaml
@@ -16,7 +16,6 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <Border 
-                    Margin="{TemplateBinding Margin}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}">
                     <DockPanel>
diff --git a/samples/ControlCatalog/ViewModels/ContextFlyoutPageViewModel.cs b/samples/ControlCatalog/ViewModels/ContextFlyoutPageViewModel.cs
deleted file mode 100644
index 8e7fc442f6..0000000000
--- a/samples/ControlCatalog/ViewModels/ContextFlyoutPageViewModel.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System.Collections.Generic;
-using System.Reactive;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.VisualTree;
-using MiniMvvm;
-
-namespace ControlCatalog.ViewModels
-{
-    public class ContextFlyoutPageViewModel
-    {
-        public Control View { get; set; }
-        public ContextFlyoutPageViewModel()
-        {
-            OpenCommand = MiniCommand.CreateFromTask(Open);
-            SaveCommand = MiniCommand.Create(Save);
-            OpenRecentCommand = MiniCommand.Create<string>(OpenRecent);
-
-            MenuItems = new[]
-            {
-                new MenuItemViewModel { Header = "_Open...", Command = OpenCommand },
-                new MenuItemViewModel { Header = "Save", Command = SaveCommand },
-                new MenuItemViewModel { Header = "-" },
-                new MenuItemViewModel
-                {
-                    Header = "Recent",
-                    Items = new[]
-                    {
-                        new MenuItemViewModel
-                        {
-                            Header = "File1.txt",
-                            Command = OpenRecentCommand,
-                            CommandParameter = @"c:\foo\File1.txt"
-                        },
-                        new MenuItemViewModel
-                        {
-                            Header = "File2.txt",
-                            Command = OpenRecentCommand,
-                            CommandParameter = @"c:\foo\File2.txt"
-                        },
-                    }
-                },
-            };
-        }
-
-        public IReadOnlyList<MenuItemViewModel> MenuItems { get; set; }
-        public MiniCommand OpenCommand { get; }
-        public MiniCommand SaveCommand { get; }
-        public MiniCommand OpenRecentCommand { get; }
-
-        public async Task Open()
-        {
-            var window = View?.GetVisualRoot() as Window;
-            if (window == null)
-                return;
-            var dialog = new OpenFileDialog();
-            var result = await dialog.ShowAsync(window);
-
-            if (result != null)
-            {
-                foreach (var path in result)
-                {
-                    System.Diagnostics.Debug.WriteLine($"Opened: {path}");
-                }
-            }
-        }
-
-        public void Save()
-        {
-            System.Diagnostics.Debug.WriteLine("Save");
-        }
-
-        public void OpenRecent(string path)
-        {
-            System.Diagnostics.Debug.WriteLine($"Open recent: {path}");
-        }
-    }
-}
diff --git a/samples/ControlCatalog/ViewModels/ContextMenuPageViewModel.cs b/samples/ControlCatalog/ViewModels/ContextPageViewModel.cs
similarity index 96%
rename from samples/ControlCatalog/ViewModels/ContextMenuPageViewModel.cs
rename to samples/ControlCatalog/ViewModels/ContextPageViewModel.cs
index 3f5d0cd93c..b46ffeb007 100644
--- a/samples/ControlCatalog/ViewModels/ContextMenuPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/ContextPageViewModel.cs
@@ -7,10 +7,10 @@ using MiniMvvm;
 
 namespace ControlCatalog.ViewModels
 {
-    public class ContextMenuPageViewModel
+    public class ContextPageViewModel
     {
         public Control View { get; set; }
-        public ContextMenuPageViewModel()
+        public ContextPageViewModel()
         {
             OpenCommand = MiniCommand.CreateFromTask(Open);
             SaveCommand = MiniCommand.Create(Save);
diff --git a/samples/RenderDemo/Pages/AnimationsPage.xaml b/samples/RenderDemo/Pages/AnimationsPage.xaml
index 21c7d68b5d..9043bac33e 100644
--- a/samples/RenderDemo/Pages/AnimationsPage.xaml
+++ b/samples/RenderDemo/Pages/AnimationsPage.xaml
@@ -161,6 +161,151 @@
           </Animation>
         </Style.Animations>
       </Style>
+
+      <Style Selector="Border.Rect7">
+        <Style.Animations>
+          <Animation Duration="0:0:3"
+                     IterationCount="Infinite"
+                     PlaybackDirection="Alternate">
+            <KeyFrame Cue="0%">
+              <Setter Property="Background" Value="Red" />
+            </KeyFrame>
+            <KeyFrame Cue="30%">
+              <Setter Property="Background">
+                <LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,100%">
+                  <GradientStop Offset="0" Color="Red"/>
+                  <GradientStop Offset="1" Color="Blue"/>
+                </LinearGradientBrush>
+              </Setter>
+            </KeyFrame>
+            <KeyFrame Cue="60%">
+              <Setter Property="Background" Value="Blue" />
+            </KeyFrame>
+            <KeyFrame Cue="100%">
+              <Setter Property="Background">
+                <LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,100%">
+                  <GradientStop Offset="0" Color="Green"/>
+                  <GradientStop Offset="1" Color="Yellow"/>
+                </LinearGradientBrush>
+              </Setter>
+            </KeyFrame>
+          </Animation>
+        </Style.Animations>
+      </Style>
+
+      <Style Selector="Border.Rect8">
+        <Style.Animations>
+          <Animation Duration="0:0:3"
+                     IterationCount="Infinite"
+                     PlaybackDirection="Alternate">
+            <KeyFrame Cue="0%">
+              <Setter Property="Background">
+                <LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,100%">
+                  <GradientStop Offset="0" Color="Red"/>
+                  <GradientStop Offset="1" Color="Blue"/>
+                </LinearGradientBrush>
+              </Setter>
+            </KeyFrame>
+            <KeyFrame Cue="50%">
+              <Setter Property="Background">
+                <LinearGradientBrush StartPoint="100%,0%" EndPoint="0%,100%">
+                  <GradientStop Offset="0" Color="Red"/>
+                  <GradientStop Offset="0.25" Color="Blue"/>
+                  <GradientStop Offset="0.5" Color="Blue"/>
+                  <GradientStop Offset="0.75" Color="Green"/>
+                  <GradientStop Offset="1" Color="Yellow"/>
+                </LinearGradientBrush>
+              </Setter>
+            </KeyFrame>
+            <KeyFrame Cue="100%">
+              <Setter Property="Background">
+                <LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,100%">
+                  <GradientStop Offset="0" Color="Red"/>
+                  <GradientStop Offset="1" Color="Blue"/>
+                </LinearGradientBrush>
+              </Setter>
+            </KeyFrame>
+          </Animation>
+        </Style.Animations>
+      </Style>
+
+      <Style Selector="Border.Rect9">
+        <Style.Animations>
+          <Animation Duration="0:0:3"
+                     IterationCount="Infinite"
+                     PlaybackDirection="Alternate">
+            <KeyFrame Cue="0%">
+              <Setter Property="Background">
+                <ConicGradientBrush Center="50%,50%" Angle="0">
+                  <GradientStop Offset="0" Color="Blue"/>
+                  <GradientStop Offset="0.5" Color="Red"/>
+                  <GradientStop Offset="1" Color="Blue"/>
+                </ConicGradientBrush>
+              </Setter>
+            </KeyFrame>
+            <KeyFrame Cue="100%">
+              <Setter Property="Background">
+                <ConicGradientBrush Center="50%,70%" Angle="90">
+                  <GradientStop Offset="0" Color="Green"/>
+                  <GradientStop Offset="0.25" Color="Yellow"/>
+                  <GradientStop Offset="0.5" Color="Red"/>
+                  <GradientStop Offset="0.75" Color="Blue"/>
+                  <GradientStop Offset="1" Color="Green"/>
+                </ConicGradientBrush>
+              </Setter>
+            </KeyFrame>
+          </Animation>
+        </Style.Animations>
+      </Style>
+
+      <Style Selector="Border.Rect10">
+        <Style.Animations>
+          <Animation Duration="0:0:3"
+                     IterationCount="Infinite"
+                     PlaybackDirection="Normal">
+            <KeyFrame Cue="0%">
+              <Setter Property="Background">
+                <RadialGradientBrush Center="0%,100%" Radius="0.8">
+                  <GradientStop Offset="0" Color="Red"/>
+                  <GradientStop Offset="1" Color="Blue"/>
+                </RadialGradientBrush>
+              </Setter>
+            </KeyFrame>
+            <KeyFrame Cue="25%">
+              <Setter Property="Background">
+                <RadialGradientBrush Center="0%,0%" Radius="1">
+                  <GradientStop Offset="0" Color="Red"/>
+                  <GradientStop Offset="1" Color="Blue"/>
+                </RadialGradientBrush>
+              </Setter>
+            </KeyFrame>
+            <KeyFrame Cue="50%">
+              <Setter Property="Background">
+                <RadialGradientBrush Center="100%,0%" Radius="0.8">
+                  <GradientStop Offset="0" Color="Red"/>
+                  <GradientStop Offset="1" Color="Blue"/>
+                </RadialGradientBrush>
+              </Setter>
+            </KeyFrame>
+            <KeyFrame Cue="75%">
+              <Setter Property="Background">
+                <RadialGradientBrush Center="100%,100%" Radius="1">
+                  <GradientStop Offset="0" Color="Red"/>
+                  <GradientStop Offset="1" Color="Blue"/>
+                </RadialGradientBrush>
+              </Setter>
+            </KeyFrame>
+            <KeyFrame Cue="100%">
+              <Setter Property="Background">
+                <RadialGradientBrush Center="0%,100%" Radius="0.8">
+                  <GradientStop Offset="0" Color="Red"/>
+                  <GradientStop Offset="1" Color="Blue"/>
+                </RadialGradientBrush>
+              </Setter>
+            </KeyFrame>
+          </Animation>
+        </Style.Animations>
+      </Style>
     </Styles>
   </UserControl.Styles>
   <Grid>
@@ -181,6 +326,10 @@
         <Border Classes="Test Rect6" Background="Red"/>
         <Border Classes="Test Shadow" CornerRadius="10" Child="{x:Null}" />
         <Border Classes="Test Shadow" CornerRadius="0 30 60 0" Child="{x:Null}" />
+        <Border Classes="Test Rect7" Child="{x:Null}" />
+        <Border Classes="Test Rect8" Child="{x:Null}" />
+        <Border Classes="Test Rect9" Child="{x:Null}" />
+        <Border Classes="Test Rect10" Child="{x:Null}" />
       </WrapPanel>
     </StackPanel>
   </Grid>
diff --git a/samples/RenderDemo/Pages/TransitionsPage.xaml b/samples/RenderDemo/Pages/TransitionsPage.xaml
index 1985074b0f..71b6ea0713 100644
--- a/samples/RenderDemo/Pages/TransitionsPage.xaml
+++ b/samples/RenderDemo/Pages/TransitionsPage.xaml
@@ -167,13 +167,80 @@
       <Style Selector="Border.Rect11:pointerover">
         <Setter Property="Background" >
           <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
-            <LinearGradientBrush.GradientStops>
-              <GradientStop Offset="0" Color="Red"/>
-              <GradientStop Offset="1" Color="Blue"/>
-            </LinearGradientBrush.GradientStops>
+            <GradientStop Offset="0" Color="Red"/>
+            <GradientStop Offset="1" Color="Blue"/>
           </LinearGradientBrush>
         </Setter>
       </Style>
+
+      <Style Selector="Border.Rect12">
+        <Setter Property="Transitions">
+          <Transitions>
+            <BrushTransition Property="Background" Duration="0:0:0.5" />
+          </Transitions>
+        </Setter>
+        <Setter Property="Background" >
+          <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+            <GradientStop Offset="0" Color="Red"/>
+            <GradientStop Offset="1" Color="Blue"/>
+          </LinearGradientBrush>
+        </Setter>
+      </Style>
+
+      <Style Selector="Border.Rect12:pointerover">
+        <Setter Property="Background" >
+          <LinearGradientBrush StartPoint="100%,0%" EndPoint="0%,100%">
+            <GradientStop Offset="0" Color="Green"/>
+            <GradientStop Offset="1" Color="Yellow"/>
+          </LinearGradientBrush>
+        </Setter>
+      </Style>
+
+      <Style Selector="Border.Rect13">
+        <Setter Property="Transitions">
+          <Transitions>
+            <BrushTransition Property="Background" Duration="0:0:0.5" />
+          </Transitions>
+        </Setter>
+        <Setter Property="Background" >
+          <ConicGradientBrush Center="50%,50%" Angle="0">
+            <GradientStop Offset="0" Color="Red"/>
+            <GradientStop Offset="1" Color="Blue"/>
+          </ConicGradientBrush>
+        </Setter>
+      </Style>
+
+      <Style Selector="Border.Rect13:pointerover">
+        <Setter Property="Background" >
+          <ConicGradientBrush Center="70%,70%" Angle="90">
+            <GradientStop Offset="0" Color="Green"/>
+            <GradientStop Offset="1" Color="Yellow"/>
+          </ConicGradientBrush>
+        </Setter>
+      </Style>
+
+      <Style Selector="Border.Rect14">
+        <Setter Property="Transitions">
+          <Transitions>
+            <BrushTransition Property="Background" Duration="0:0:0.5" />
+          </Transitions>
+        </Setter>
+        <Setter Property="Background" >
+          <RadialGradientBrush Center="50%,50%" Radius="0.5">
+            <GradientStop Offset="0" Color="Red"/>
+            <GradientStop Offset="1" Color="Blue"/>
+          </RadialGradientBrush>
+        </Setter>
+      </Style>
+
+      <Style Selector="Border.Rect14:pointerover">
+        <Setter Property="Background" >
+          <RadialGradientBrush Center="30%,30%" Radius="0.2">
+            <GradientStop Offset="0" Color="Green"/>
+            <GradientStop Offset="1" Color="Yellow"/>
+          </RadialGradientBrush>
+        </Setter>
+      </Style>
     </Styles>
   </UserControl.Styles>
 
@@ -202,6 +269,15 @@
 
         <Border Classes="Test Rect10" />
         <Border Classes="Test Rect11" />
+
+        <Border Classes="Test Rect12" Child="{x:Null}"/>
+        <Border Classes="Test Rect13" Child="{x:Null}"/>
+        <Border Classes="Test Rect14" Child="{x:Null}"/>
+        
+        <Border Classes="Test Rect14" />
+        <Border Classes="Test Rect14" />
+        <Border Classes="Test Rect14" />
+        <Border Classes="Test Rect14" />
       </WrapPanel>
     </StackPanel>
   </Grid>
diff --git a/samples/RenderDemo/SideBar.xaml b/samples/RenderDemo/SideBar.xaml
index fd23067f61..b82a7b0514 100644
--- a/samples/RenderDemo/SideBar.xaml
+++ b/samples/RenderDemo/SideBar.xaml
@@ -7,7 +7,6 @@
     <Setter Property="Template">
       <ControlTemplate>
         <Border
-            Margin="{TemplateBinding Margin}"
             BorderBrush="{TemplateBinding BorderBrush}"
             BorderThickness="{TemplateBinding BorderThickness}">
           <DockPanel>
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
index a72742580c..0afb1db141 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@@ -67,7 +67,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
 
         public Action<Rect> Paint { get; set; }
 
-        public Action<Size> Resized { get; set; }
+        public Action<Size, PlatformResizeReason> Resized { get; set; }
 
         public Action<double> ScalingChanged { get; set; }
 
@@ -134,7 +134,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
 
         protected virtual void OnResized(Size size)
         {
-            Resized?.Invoke(size);
+            Resized?.Invoke(size, PlatformResizeReason.Unspecified);
         }
 
         class ViewImpl : InvalidationAwareSurfaceView, ISurfaceHolderCallback, IInitEditorInfo
diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 6a9cff6b71..ce5b37043f 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -861,7 +861,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Logs a mesage if the notification represents a binding error.
+        /// Logs a message if the notification represents a binding error.
         /// </summary>
         /// <param name="property">The property being bound.</param>
         /// <param name="value">The binding notification.</param>
diff --git a/src/Avalonia.Base/AvaloniaProperty.cs b/src/Avalonia.Base/AvaloniaProperty.cs
index 5117fdb170..94aefb8869 100644
--- a/src/Avalonia.Base/AvaloniaProperty.cs
+++ b/src/Avalonia.Base/AvaloniaProperty.cs
@@ -465,9 +465,9 @@ namespace Avalonia
         /// Uses the visitor pattern to resolve an untyped property to a typed property.
         /// </summary>
         /// <typeparam name="TData">The type of user data passed.</typeparam>
-        /// <param name="vistor">The visitor which will accept the typed property.</param>
+        /// <param name="visitor">The visitor which will accept the typed property.</param>
         /// <param name="data">The user data to pass.</param>
-        public abstract void Accept<TData>(IAvaloniaPropertyVisitor<TData> vistor, ref TData data)
+        public abstract void Accept<TData>(IAvaloniaPropertyVisitor<TData> visitor, ref TData data)
             where TData : struct;
 
         /// <summary>
diff --git a/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs.cs b/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs.cs
index c1a2832fde..896d86e29d 100644
--- a/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs.cs
+++ b/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs.cs
@@ -58,8 +58,8 @@ namespace Avalonia
         /// <remarks>
         /// This will usually be true, except in
         /// <see cref="AvaloniaObject.OnPropertyChangedCore{T}(AvaloniaPropertyChangedEventArgs{T})"/>
-        /// which recieves notifications for all changes to property values, whether a value with a higher
-        /// priority is present or not. When this property is false, the change that is being signalled
+        /// which receives notifications for all changes to property values, whether a value with a higher
+        /// priority is present or not. When this property is false, the change that is being signaled
         /// has not resulted in a change to the property value on the object.
         /// </remarks>
         public bool IsEffectiveValueChange { get; private set; }
diff --git a/src/Avalonia.Base/Collections/Pooled/PooledList.cs b/src/Avalonia.Base/Collections/Pooled/PooledList.cs
index e50e100d32..2cd9758f12 100644
--- a/src/Avalonia.Base/Collections/Pooled/PooledList.cs
+++ b/src/Avalonia.Base/Collections/Pooled/PooledList.cs
@@ -1271,7 +1271,7 @@ namespace Avalonia.Collections.Pooled
         /// Reverses the elements in a range of this list. Following a call to this
         /// method, an element in the range given by index and count
         /// which was previously located at index i will now be located at
-        /// index index + (index + count - i - 1).
+        /// index + (index + count - i - 1).
         /// </summary>
         public void Reverse(int index, int count)
         {
diff --git a/src/Avalonia.Base/Data/Converters/BoolConverters.cs b/src/Avalonia.Base/Data/Converters/BoolConverters.cs
index 9329cdd6af..3985c5e32f 100644
--- a/src/Avalonia.Base/Data/Converters/BoolConverters.cs
+++ b/src/Avalonia.Base/Data/Converters/BoolConverters.cs
@@ -18,5 +18,11 @@ namespace Avalonia.Data.Converters
         /// </summary>
         public static readonly IMultiValueConverter Or =
             new FuncMultiValueConverter<bool, bool>(x => x.Any(y => y));
+
+        /// <summary>
+        /// A value converter that returns true when input is false and false when input is true.
+        /// </summary>
+        public static readonly IValueConverter Not =
+            new FuncValueConverter<bool, bool>(x => !x);
     }
 }
diff --git a/src/Avalonia.Base/Data/Core/Plugins/IDataValidationPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/IDataValidationPlugin.cs
index 324279e9f0..2a580fe75f 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/IDataValidationPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/IDataValidationPlugin.cs
@@ -20,7 +20,7 @@ namespace Avalonia.Data.Core.Plugins
         /// </summary>
         /// <param name="reference">A weak reference to the object.</param>
         /// <param name="propertyName">The property name.</param>
-        /// <param name="inner">The inner property accessor used to aceess the property.</param>
+        /// <param name="inner">The inner property accessor used to access the property.</param>
         /// <returns>
         /// An <see cref="IPropertyAccessor"/> interface through which future interactions with the 
         /// property will be made.
diff --git a/src/Avalonia.Base/DirectPropertyBase.cs b/src/Avalonia.Base/DirectPropertyBase.cs
index e6cc1edfdf..a057ad2254 100644
--- a/src/Avalonia.Base/DirectPropertyBase.cs
+++ b/src/Avalonia.Base/DirectPropertyBase.cs
@@ -13,7 +13,7 @@ namespace Avalonia
     /// <typeparam name="TValue">The type of the property's value.</typeparam>
     /// <remarks>
     /// Whereas <see cref="DirectProperty{TOwner, TValue}"/> is typed on the owner type, this base
-    /// class provides a non-owner-typed interface to a direct poperty.
+    /// class provides a non-owner-typed interface to a direct property.
     /// </remarks>
     public abstract class DirectPropertyBase<TValue> : AvaloniaProperty<TValue>
     {
@@ -123,9 +123,9 @@ namespace Avalonia
         }
 
         /// <inheritdoc/>
-        public override void Accept<TData>(IAvaloniaPropertyVisitor<TData> vistor, ref TData data)
+        public override void Accept<TData>(IAvaloniaPropertyVisitor<TData> visitor, ref TData data)
         {
-            vistor.Visit(this, ref data);
+            visitor.Visit(this, ref data);
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Base/DirectPropertyMetadata`1.cs b/src/Avalonia.Base/DirectPropertyMetadata`1.cs
index 205967984d..eabdef05ed 100644
--- a/src/Avalonia.Base/DirectPropertyMetadata`1.cs
+++ b/src/Avalonia.Base/DirectPropertyMetadata`1.cs
@@ -38,7 +38,7 @@ namespace Avalonia
         /// <remarks>
         /// Data validation is validation performed at the target of a binding, for example in a
         /// view model using the INotifyDataErrorInfo interface. Only certain properties on a
-        /// control (such as a TextBox's Text property) will be interested in recieving data
+        /// control (such as a TextBox's Text property) will be interested in receiving data
         /// validation messages so this feature must be explicitly enabled by setting this flag.
         /// </remarks>
         public bool? EnableDataValidation { get; private set; }
diff --git a/src/Avalonia.Controls.DataGrid/Collections/DataGridCollectionView.cs b/src/Avalonia.Controls.DataGrid/Collections/DataGridCollectionView.cs
index 5b1e43b8f4..fe6acdc532 100644
--- a/src/Avalonia.Controls.DataGrid/Collections/DataGridCollectionView.cs
+++ b/src/Avalonia.Controls.DataGrid/Collections/DataGridCollectionView.cs
@@ -877,7 +877,7 @@ namespace Avalonia.Collections
                         if (!CheckFlag(CollectionViewFlags.IsMoveToPageDeferred))
                         {
                             // if the temporaryGroup was not created yet and is out of sync
-                            // then create it so that we can use it as a refernce while paging.
+                            // then create it so that we can use it as a reference while paging.
                             if (IsGrouping && _temporaryGroup.ItemCount != InternalList.Count)
                             {
                                 PrepareTemporaryGroups();
@@ -889,7 +889,7 @@ namespace Avalonia.Collections
                     else if (IsGrouping)
                     {
                         // if the temporaryGroup was not created yet and is out of sync
-                        // then create it so that we can use it as a refernce while paging.
+                        // then create it so that we can use it as a reference while paging.
                         if (_temporaryGroup.ItemCount != InternalList.Count)
                         {
                             // update the groups that get created for the
@@ -1951,7 +1951,7 @@ namespace Avalonia.Collections
             EnsureCollectionInSync();
             VerifyRefreshNotDeferred();
 
-            // for indicies larger than the count
+            // for indices larger than the count
             if (index >= Count || index < 0)
             {
                 throw new ArgumentOutOfRangeException("index");
@@ -3800,7 +3800,7 @@ namespace Avalonia.Collections
         /// </summary>
         /// <remarks>
         /// This method can be called from a constructor - it does not call
-        /// any virtuals.  The 'count' parameter is substitute for the real Count,
+        /// any virtuals. The 'count' parameter is substitute for the real Count,
         /// used only when newItem is null.
         /// In that case, this method sets IsCurrentAfterLast to true if and only
         /// if newPosition >= count.  This distinguishes between a null belonging
diff --git a/src/Avalonia.Controls.DataGrid/DataGrid.cs b/src/Avalonia.Controls.DataGrid/DataGrid.cs
index 83f13fe199..ab1aff9220 100644
--- a/src/Avalonia.Controls.DataGrid/DataGrid.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGrid.cs
@@ -25,6 +25,7 @@ using System.ComponentModel.DataAnnotations;
 using Avalonia.Controls.Utils;
 using Avalonia.Layout;
 using Avalonia.Controls.Metadata;
+using Avalonia.Input.GestureRecognizers;
 
 namespace Avalonia.Controls
 {
@@ -67,7 +68,7 @@ namespace Avalonia.Controls
         private const double DATAGRID_minimumColumnHeaderHeight = 4;
         internal const double DATAGRID_maximumStarColumnWidth = 10000;
         internal const double DATAGRID_minimumStarColumnWidth = 0.001;
-        private const double DATAGRID_mouseWheelDelta = 72.0;
+        private const double DATAGRID_mouseWheelDelta = 50.0;
         private const double DATAGRID_maxHeadersThickness = 32768;
 
         private const double DATAGRID_defaultRowHeight = 22;
@@ -2214,32 +2215,71 @@ namespace Avalonia.Controls
         /// <param name="e">PointerWheelEventArgs</param>
         protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
         {
-            if (IsEnabled && !e.Handled && DisplayData.NumDisplayedScrollingElements > 0)
+            e.Handled = e.Handled || UpdateScroll(e.Delta * DATAGRID_mouseWheelDelta);
+        }
+
+        internal bool UpdateScroll(Vector delta)
+        {
+            if (IsEnabled && DisplayData.NumDisplayedScrollingElements > 0)
             {
-                double scrollHeight = 0;
-                if (e.Delta.Y > 0)
+                var handled = false;
+                var scrollHeight = 0d;
+
+                // Vertical scroll handling
+                if (delta.Y > 0)
                 {
-                    scrollHeight = Math.Max(-_verticalOffset, -DATAGRID_mouseWheelDelta);
+                    scrollHeight = Math.Max(-_verticalOffset, -delta.Y);
                 }
-                else if (e.Delta.Y < 0)
+                else if (delta.Y < 0)
                 {
                     if (_vScrollBar != null && VerticalScrollBarVisibility == ScrollBarVisibility.Visible)
                     {
-                        scrollHeight = Math.Min(Math.Max(0, _vScrollBar.Maximum - _verticalOffset), DATAGRID_mouseWheelDelta);
+                        scrollHeight = Math.Min(Math.Max(0, _vScrollBar.Maximum - _verticalOffset), -delta.Y);
                     }
                     else
                     {
                         double maximum = EdgedRowsHeightCalculated - CellsHeight;
-                        scrollHeight = Math.Min(Math.Max(0, maximum - _verticalOffset), DATAGRID_mouseWheelDelta);
+                        scrollHeight = Math.Min(Math.Max(0, maximum - _verticalOffset), -delta.Y);
                     }
                 }
+
                 if (scrollHeight != 0)
                 {
                     DisplayData.PendingVerticalScrollHeight = scrollHeight;
+                    handled = true;
+                }
+
+                // Horizontal scroll handling
+                if (delta.X != 0)
+                {
+                    var originalHorizontalOffset = HorizontalOffset;
+                    var horizontalOffset = originalHorizontalOffset - delta.X;
+                    var widthNotVisible = Math.Max(0, ColumnsInternal.VisibleEdgedColumnsWidth - CellsWidth);
+
+                    if (horizontalOffset < 0)
+                    {
+                        horizontalOffset = 0;
+                    }
+                    if (horizontalOffset > widthNotVisible)
+                    {
+                        horizontalOffset = widthNotVisible;
+                    }
+
+                    if (horizontalOffset != originalHorizontalOffset)
+                    {
+                        HorizontalOffset = horizontalOffset;
+                        handled = true;
+                    }
+                }
+
+                if (handled)
+                {
                     InvalidateRowsMeasure(invalidateIndividualElements: false);
-                    e.Handled = true;
+                    return true;
                 }
             }
+
+            return false;
         }
 
         /// <summary>
@@ -5731,7 +5771,7 @@ namespace Avalonia.Controls
                 {
                     if (SelectionMode == DataGridSelectionMode.Single || !ctrl)
                     {
-                        // Unselect the currectly selected rows except the new selected row
+                        // Unselect the currently selected rows except the new selected row
                         action = DataGridSelectionAction.SelectCurrent;
                     }
                     else
diff --git a/src/Avalonia.Controls.DataGrid/DataGridCell.cs b/src/Avalonia.Controls.DataGrid/DataGridCell.cs
index 445dc541a7..7dda936317 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridCell.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridCell.cs
@@ -173,7 +173,15 @@ namespace Avalonia.Controls
                     }
                     if (OwningRow != null)
                     {
-                        e.Handled = OwningGrid.UpdateStateOnMouseLeftButtonDown(e, ColumnIndex, OwningRow.Slot, !e.Handled);
+                        var handled = OwningGrid.UpdateStateOnMouseLeftButtonDown(e, ColumnIndex, OwningRow.Slot, !e.Handled);
+
+                        // Do not handle PointerPressed with touch,
+                        // so we can start scroll gesture on the same event.
+                        if (e.Pointer.Type != PointerType.Touch)
+                        {
+                            e.Handled = handled;
+                        }
+
                         OwningGrid.UpdatedStateOnMouseLeftButtonDown = true;
                     }
                 }
@@ -197,7 +205,7 @@ namespace Avalonia.Controls
         }
 
         // Makes sure the right gridline has the proper stroke and visibility. If lastVisibleColumn is specified, the 
-        // right gridline will be collapsed if this cell belongs to the lastVisibileColumn and there is no filler column
+        // right gridline will be collapsed if this cell belongs to the lastVisibleColumn and there is no filler column
         internal void EnsureGridLine(DataGridColumn lastVisibleColumn)
         {
             if (OwningGrid != null && _rightGridLine != null)
diff --git a/src/Avalonia.Controls.DataGrid/DataGridCellCoordinates.cs b/src/Avalonia.Controls.DataGrid/DataGridCellCoordinates.cs
index 2f723154be..26f0b53952 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridCellCoordinates.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridCellCoordinates.cs
@@ -40,7 +40,7 @@ namespace Avalonia.Controls
             return false;
         }
 
-        // There is build warning if this is missiing
+        // There is build warning if this is missing
         public override int GetHashCode()
         {
             return base.GetHashCode();
diff --git a/src/Avalonia.Controls.DataGrid/DataGridClipboard.cs b/src/Avalonia.Controls.DataGrid/DataGridClipboard.cs
index a4bab8b304..ee69f1c768 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridClipboard.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridClipboard.cs
@@ -189,7 +189,7 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// DataGrid row item used for proparing the ClipboardRowContent.
+        /// DataGrid row item used for preparing the ClipboardRowContent.
         /// </summary>
         public object Item
         {
diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
index 9141fb2463..4ab2869138 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
@@ -27,7 +27,6 @@ namespace Avalonia.Controls
         private double? _minWidth;
         private bool _settingWidthInternally;
         private int _displayIndexWithFiller;
-        private bool _isVisible;
         private object _header;
         private DataGridColumnHeader _headerCell;
         private IControl _editingElement;
@@ -40,7 +39,6 @@ namespace Avalonia.Controls
         /// </summary>
         protected internal DataGridColumn()
         {
-            _isVisible = true;
             _displayIndexWithFiller = -1;
             IsInitialDesiredWidthDetermined = false;
             InheritsWidth = true;
@@ -174,32 +172,42 @@ namespace Avalonia.Controls
             get => _editBinding;
         }
 
+
+        /// <summary>
+        /// Defines the <see cref="IsVisible"/> property.
+        /// </summary>
+        public static StyledProperty<bool> IsVisibleProperty =
+             Control.IsVisibleProperty.AddOwner<DataGridColumn>();
+
         /// <summary>
         /// Determines whether or not this column is visible.
         /// </summary>
         public bool IsVisible
         {
-            get
-            {
-                return _isVisible;
-            }
-            set
-            {
-                if (value != IsVisible)
-                {
-                    OwningGrid?.OnColumnVisibleStateChanging(this);
-                    _isVisible = value;
+            get => GetValue(IsVisibleProperty);
+            set => SetValue(IsVisibleProperty, value);
+        }
 
-                    if (_headerCell != null)
-                    {
-                        _headerCell.IsVisible = value;
-                    }
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            base.OnPropertyChanged(change);
 
-                    OwningGrid?.OnColumnVisibleStateChanged(this);
+            if (change.Property == IsVisibleProperty)
+            {
+                OwningGrid?.OnColumnVisibleStateChanging(this);
+                var isVisible = (change as AvaloniaPropertyChangedEventArgs<bool>).NewValue.Value;
+
+                if (_headerCell != null)
+                {
+                    _headerCell.IsVisible = isVisible;
                 }
+
+                OwningGrid?.OnColumnVisibleStateChanged(this);
+                NotifyPropertyChanged(change.Property.Name);
             }
         }
 
+
         /// <summary>
         /// Actual visible width after Width, MinWidth, and MaxWidth setting at the Column level and DataGrid level
         /// have been taken into account
@@ -787,7 +795,7 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// If the DataGrid is using using layout rounding, the pixel snapping will force all widths to
+        /// If the DataGrid is using layout rounding, the pixel snapping will force all widths to
         /// whole numbers. Since the column widths aren't visual elements, they don't go through the normal
         /// rounding process, so we need to do it ourselves.  If we don't, then we'll end up with some
         /// pixel gaps and/or overlaps between columns.
diff --git a/src/Avalonia.Controls.DataGrid/DataGridDisplayData.cs b/src/Avalonia.Controls.DataGrid/DataGridDisplayData.cs
index e659438b43..2b8055dd22 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridDisplayData.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridDisplayData.cs
@@ -79,7 +79,7 @@ namespace Avalonia.Controls
             set;
         }
 
-        internal void AddRecylableRow(DataGridRow row)
+        internal void AddRecyclableRow(DataGridRow row)
         {
             Debug.Assert(!_recyclableRows.Contains(row));
             row.DetachFromDataGrid(true);
@@ -120,7 +120,7 @@ namespace Avalonia.Controls
                     {
                         if (row.IsRecyclable)
                         {
-                            AddRecylableRow(row);
+                            AddRecyclableRow(row);
                         }
                         else
                         {
@@ -193,7 +193,7 @@ namespace Avalonia.Controls
 
         internal void FullyRecycleElements()
         {
-            // Fully recycle Recycleable rows and transfer them to Recycled rows
+            // Fully recycle Recyclable rows and transfer them to Recycled rows
             while (_recyclableRows.Count > 0)
             {
                 DataGridRow row = _recyclableRows.Pop();
@@ -202,7 +202,7 @@ namespace Avalonia.Controls
                 Debug.Assert(!_fullyRecycledRows.Contains(row));
                 _fullyRecycledRows.Push(row);
             }
-            // Fully recycle Recycleable GroupHeaders and transfer them to Recycled GroupHeaders
+            // Fully recycle Recyclable GroupHeaders and transfer them to Recycled GroupHeaders
             while (_recyclableGroupHeaders.Count > 0)
             {
                 DataGridRowGroupHeader groupHeader = _recyclableGroupHeaders.Pop();
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRow.cs b/src/Avalonia.Controls.DataGrid/DataGridRow.cs
index c3562c53a4..7546970498 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRow.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRow.cs
@@ -392,7 +392,7 @@ namespace Avalonia.Controls
             set;
         }
 
-        // Height that the row will eventually end up at after a possible detalis animation has completed
+        // Height that the row will eventually end up at after a possible details animation has completed
         internal double TargetHeight
         {
             get
@@ -517,7 +517,7 @@ namespace Avalonia.Controls
                 return base.MeasureOverride(availableSize);
             }
 
-            //Allow the DataGrid specific componets to adjust themselves based on new values
+            //Allow the DataGrid specific components to adjust themselves based on new values
             if (_headerElement != null)
             {
                 _headerElement.InvalidateMeasure();
@@ -722,7 +722,7 @@ namespace Avalonia.Controls
                 if (_bottomGridLine != null)
                 {
                     // It looks like setting Visibility sometimes has side effects so make sure the value is actually
-                    // diffferent before setting it
+                    // different before setting it
                     bool newVisibility = OwningGrid.GridLinesVisibility == DataGridGridLinesVisibility.Horizontal || OwningGrid.GridLinesVisibility == DataGridGridLinesVisibility.All;
 
                     if (newVisibility != _bottomGridLine.IsVisible)
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRows.cs b/src/Avalonia.Controls.DataGrid/DataGridRows.cs
index 4bfbd7d818..1d5c899993 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRows.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRows.cs
@@ -1193,7 +1193,7 @@ namespace Avalonia.Controls
                 else
                 {
                     groupHeader = element as DataGridRowGroupHeader;
-                    Debug.Assert(groupHeader != null);  // Nothig other and Rows and RowGroups now
+                    Debug.Assert(groupHeader != null);  // Nothing other and Rows and RowGroups now
                     if (groupHeader != null)
                     {
                         groupHeader.TotalIndent = (groupHeader.Level == 0) ? 0 : RowGroupSublevelIndents[groupHeader.Level - 1];
@@ -1636,7 +1636,7 @@ namespace Avalonia.Controls
             if (slot >= DisplayData.FirstScrollingSlot &&
                 slot <= DisplayData.LastScrollingSlot)
             {
-                // Additional row takes the spot of a displayed row - it is necessarilly displayed
+                // Additional row takes the spot of a displayed row - it is necessarily displayed
                 return true;
             }
             else if (DisplayData.FirstScrollingSlot == -1 &&
@@ -1825,7 +1825,7 @@ namespace Avalonia.Controls
                 if (MathUtilities.LessThan(firstRowHeight, NegVerticalOffset))
                 {
                     // We've scrolled off more of the first row than what's possible.  This can happen
-                    // if the first row got shorter (Ex: Collpasing RowDetails) or if the user has a recycling
+                    // if the first row got shorter (Ex: Collapsing RowDetails) or if the user has a recycling
                     // cleanup issue.  In this case, simply try to display the next row as the first row instead
                     if (newFirstScrollingSlot < SlotCount - 1)
                     {
@@ -2014,7 +2014,7 @@ namespace Avalonia.Controls
 
             if (recycleRow)
             {
-                DisplayData.AddRecylableRow(dataGridRow);
+                DisplayData.AddRecyclableRow(dataGridRow);
             }
             else
             {
@@ -2265,7 +2265,7 @@ namespace Avalonia.Controls
                     if (parentGroupInfo.LastSubItemSlot - parentGroupInfo.Slot == 1)
                     {
                         // We just added the first item to a RowGroup so the header should transition from Empty to either Expanded or Collapsed
-                        EnsureAnscestorsExpanderButtonChecked(parentGroupInfo);
+                        EnsureAncestorsExpanderButtonChecked(parentGroupInfo);
                     }
                 }
             }
@@ -2407,7 +2407,7 @@ namespace Avalonia.Controls
             return treeCount;
         }
 
-        private void EnsureAnscestorsExpanderButtonChecked(DataGridRowGroupInfo parentGroupInfo)
+        private void EnsureAncestorsExpanderButtonChecked(DataGridRowGroupInfo parentGroupInfo)
         {
             if (IsSlotVisible(parentGroupInfo.Slot))
             {
@@ -2789,11 +2789,11 @@ namespace Avalonia.Controls
             return null;
         }
 
-        internal void OnRowGroupHeaderToggled(DataGridRowGroupHeader groupHeader, bool newIsVisibile, bool setCurrent)
+        internal void OnRowGroupHeaderToggled(DataGridRowGroupHeader groupHeader, bool newIsVisible, bool setCurrent)
         {
             Debug.Assert(groupHeader.RowGroupInfo.CollectionViewGroup.ItemCount > 0);
 
-            if (WaitForLostFocus(delegate { OnRowGroupHeaderToggled(groupHeader, newIsVisibile, setCurrent); }) || !CommitEdit())
+            if (WaitForLostFocus(delegate { OnRowGroupHeaderToggled(groupHeader, newIsVisible, setCurrent); }) || !CommitEdit())
             {
                 return;
             }
@@ -2804,7 +2804,7 @@ namespace Avalonia.Controls
                 UpdateSelectionAndCurrency(CurrentColumnIndex, groupHeader.RowGroupInfo.Slot, DataGridSelectionAction.SelectCurrent, scrollIntoView: false);
             }
 
-            UpdateRowGroupVisibility(groupHeader.RowGroupInfo, newIsVisibile, isDisplayed: true);
+            UpdateRowGroupVisibility(groupHeader.RowGroupInfo, newIsVisible, isDisplayed: true);
 
             ComputeScrollBarsLayout();
             // We need force arrange since our Scrollings Rows could update without automatically triggering layout
diff --git a/src/Avalonia.Controls.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs b/src/Avalonia.Controls.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs
index 1c350a4f14..4eed119240 100644
--- a/src/Avalonia.Controls.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs
+++ b/src/Avalonia.Controls.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs
@@ -140,7 +140,7 @@ namespace Avalonia.Controls.Primitives
                 if (dataGridColumn.IsFrozen)
                 {
                     columnHeader.Arrange(new Rect(frozenLeftEdge, 0, dataGridColumn.LayoutRoundedWidth, finalSize.Height));
-                    columnHeader.Clip = null; // The layout system could have clipped this becaues it's not aware of our render transform
+                    columnHeader.Clip = null; // The layout system could have clipped this because it's not aware of our render transform
                     if (DragColumn == dataGridColumn && DragIndicator != null)
                     {
                         dragIndicatorLeftEdge = frozenLeftEdge + DragIndicatorOffset;
diff --git a/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs b/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs
index 0d19f4c479..308ebc69d4 100644
--- a/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs
+++ b/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs
@@ -5,6 +5,9 @@
 
 using System;
 using System.Diagnostics;
+
+using Avalonia.Input;
+using Avalonia.Input.GestureRecognizers;
 using Avalonia.Layout;
 using Avalonia.Media;
 
@@ -16,6 +19,11 @@ namespace Avalonia.Controls.Primitives
     /// </summary>
     public sealed class DataGridRowsPresenter : Panel
     {
+        public DataGridRowsPresenter()
+        {
+            AddHandler(Gestures.ScrollGestureEvent, OnScrollGesture);
+        }
+
         internal DataGrid OwningGrid
         {
             get;
@@ -176,6 +184,11 @@ namespace Avalonia.Controls.Primitives
             return new Size(totalCellsWidth + headerWidth, totalHeight);
         }
 
+        private void OnScrollGesture(object sender, ScrollGestureEventArgs e)
+        {
+            e.Handled = e.Handled || OwningGrid.UpdateScroll(-e.Delta);
+        }
+
 #if DEBUG
         internal void PrintChildren()
         {
diff --git a/src/Avalonia.Controls.DataGrid/Themes/Default.xaml b/src/Avalonia.Controls.DataGrid/Themes/Default.xaml
index 09d19c8e43..ca0873e183 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Default.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Default.xaml
@@ -247,7 +247,11 @@
             <DataGridColumnHeader Name="PART_TopRightCornerHeader" Grid.Column="2"/>
             <Rectangle Name="PART_ColumnHeadersAndRowsSeparator" Grid.ColumnSpan="3" VerticalAlignment="Bottom" StrokeThickness="1" Height="1" Fill="{DynamicResource ThemeControlMidHighBrush}"/>
 
-            <DataGridRowsPresenter Name="PART_RowsPresenter" Grid.ColumnSpan="2" Grid.Row="1" />
+            <DataGridRowsPresenter Name="PART_RowsPresenter" Grid.ColumnSpan="2" Grid.Row="1">
+              <DataGridRowsPresenter.GestureRecognizers>
+                <ScrollGestureRecognizer CanHorizontallyScroll="True" CanVerticallyScroll="True" />
+              </DataGridRowsPresenter.GestureRecognizers>
+            </DataGridRowsPresenter>
             <Rectangle Name="PART_BottomRightCorner" Fill="{DynamicResource ThemeControlMidHighBrush}" Grid.Column="2" Grid.Row="2" />
             <Rectangle Name="BottomLeftCorner" Fill="{DynamicResource ThemeControlMidHighBrush}" Grid.Row="2" Grid.ColumnSpan="2" />
             <ScrollBar Name="PART_VerticalScrollbar" Orientation="Vertical" Grid.Column="2" Grid.Row="1" Width="{DynamicResource ScrollBarThickness}"/>
diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
index 0c4f8249ce..8ccf717d94 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -6,8 +6,8 @@
     <x:Double x:Key="ListAccentLowOpacity">0.6</x:Double>
     <x:Double x:Key="ListAccentMediumOpacity">0.8</x:Double>
 
-    <StreamGeometry x:Key="DataGridSortIconAscendingPath">M1875 1011l-787 787v-1798h-128v1798l-787 -787l-90 90l941 941l941 -941z</StreamGeometry>
-    <StreamGeometry x:Key="DataGridSortIconDescendingPath">M1965 947l-941 -941l-941 941l90 90l787 -787v1798h128v-1798l787 787z</StreamGeometry>
+    <StreamGeometry x:Key="DataGridSortIconDescendingPath">M1875 1011l-787 787v-1798h-128v1798l-787 -787l-90 90l941 941l941 -941z</StreamGeometry>
+    <StreamGeometry x:Key="DataGridSortIconAscendingPath">M1965 947l-941 -941l-941 941l90 90l787 -787v1798h128v-1798l787 787z</StreamGeometry>
     <StreamGeometry x:Key="DataGridRowGroupHeaderIconClosedPath">M515 93l930 931l-930 931l90 90l1022 -1021l-1022 -1021z</StreamGeometry>
     <StreamGeometry x:Key="DataGridRowGroupHeaderIconOpenedPath">M1939 1581l90 -90l-1005 -1005l-1005 1005l90 90l915 -915z</StreamGeometry>
 
@@ -601,7 +601,11 @@
             <DataGridRowsPresenter Name="PART_RowsPresenter"
                                    Grid.Row="1"
                                    Grid.RowSpan="2"
-                                   Grid.ColumnSpan="3" />
+                                   Grid.ColumnSpan="3">
+              <DataGridRowsPresenter.GestureRecognizers>
+                <ScrollGestureRecognizer CanHorizontallyScroll="True" CanVerticallyScroll="True" />
+              </DataGridRowsPresenter.GestureRecognizers>
+            </DataGridRowsPresenter>
             <Rectangle Name="PART_BottomRightCorner"
                        Fill="{DynamicResource DataGridScrollBarsSeparatorBackground}"
                        Grid.Column="2"
diff --git a/src/Avalonia.Controls.DataGrid/Utils/ReflectionHelper.cs b/src/Avalonia.Controls.DataGrid/Utils/ReflectionHelper.cs
index 47d1ac1c0b..38e18b57de 100644
--- a/src/Avalonia.Controls.DataGrid/Utils/ReflectionHelper.cs
+++ b/src/Avalonia.Controls.DataGrid/Utils/ReflectionHelper.cs
@@ -340,10 +340,30 @@ namespace Avalonia.Controls.Utils
         internal static PropertyInfo GetPropertyOrIndexer(this Type type, string propertyPath, out object[] index)
         {
             index = null;
+            // Return the default value of GetProperty if the first character is not an indexer token.
             if (string.IsNullOrEmpty(propertyPath) || propertyPath[0] != LeftIndexerToken)
             {
-                // Return the default value of GetProperty if the first character is not an indexer token.
-                return type.GetProperty(propertyPath);
+                var property = type.GetProperty(propertyPath);
+                if (property != null)
+                {
+                    return property;
+                }
+
+                // GetProperty does not return inherited interface properties,
+                // so we need to enumerate them manually.
+                if (type.IsInterface)
+                {
+                    foreach (var typeInterface in type.GetInterfaces())
+                    {
+                        property = type.GetProperty(propertyPath);
+                        if (property != null)
+                        {
+                            return property;
+                        }
+                    }
+                }
+
+                return null;
             }
 
             if (propertyPath.Length < 2 || propertyPath[propertyPath.Length - 1] != RightIndexerToken)
diff --git a/src/Avalonia.Controls/ApiCompatBaseline.txt b/src/Avalonia.Controls/ApiCompatBaseline.txt
index bb133900d9..fac5923db5 100644
--- a/src/Avalonia.Controls/ApiCompatBaseline.txt
+++ b/src/Avalonia.Controls/ApiCompatBaseline.txt
@@ -30,12 +30,29 @@ MembersMustExist : Member 'public System.Double Avalonia.Controls.NumericUpDownV
 MembersMustExist : Member 'public System.Double Avalonia.Controls.NumericUpDownValueChangedEventArgs.OldValue.get()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.StyledProperty<System.Boolean> Avalonia.StyledProperty<System.Boolean> Avalonia.Controls.ScrollViewer.AllowAutoHideProperty' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.AvaloniaProperty<Avalonia.Media.Stretch> Avalonia.AvaloniaProperty<Avalonia.Media.Stretch> Avalonia.Controls.Viewbox.StretchProperty' does not exist in the implementation but it does exist in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public System.EventHandler<Avalonia.Controls.ApplicationLifetimes.ShutdownRequestedEventArgs> Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime.ShutdownRequested' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime.add_ShutdownRequested(System.EventHandler<Avalonia.Controls.ApplicationLifetimes.ShutdownRequestedEventArgs>)' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime.remove_ShutdownRequested(System.EventHandler<Avalonia.Controls.ApplicationLifetimes.ShutdownRequestedEventArgs>)' is present in the implementation but not in the contract.
+MembersMustExist : Member 'public System.Action<Avalonia.Size> Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.Resized.get()' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public void Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.Resized.set(System.Action<Avalonia.Size>)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public void Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.SetCursor(Avalonia.Platform.IPlatformHandle)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.AvaloniaProperty Avalonia.AvaloniaProperty Avalonia.Controls.Notifications.NotificationCard.CloseOnClickProperty' does not exist in the implementation but it does exist in the contract.
 EnumValuesMustMatch : Enum value 'Avalonia.Platform.ExtendClientAreaChromeHints Avalonia.Platform.ExtendClientAreaChromeHints.Default' is (System.Int32)2 in the implementation but (System.Int32)1 in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Nullable<Avalonia.Size> Avalonia.Platform.ITopLevelImpl.FrameSize' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Nullable<Avalonia.Size> Avalonia.Platform.ITopLevelImpl.FrameSize.get()' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public System.Action<Avalonia.Size, Avalonia.Platform.PlatformResizeReason> Avalonia.Platform.ITopLevelImpl.Resized.get()' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public System.Action<Avalonia.Size> Avalonia.Platform.ITopLevelImpl.Resized.get()' is present in the contract but not in the implementation.
+MembersMustExist : Member 'public System.Action<Avalonia.Size> Avalonia.Platform.ITopLevelImpl.Resized.get()' does not exist in the implementation but it does exist in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.ITopLevelImpl.Resized.set(System.Action<Avalonia.Size, Avalonia.Platform.PlatformResizeReason>)' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.ITopLevelImpl.Resized.set(System.Action<Avalonia.Size>)' is present in the contract but not in the implementation.
+MembersMustExist : Member 'public void Avalonia.Platform.ITopLevelImpl.Resized.set(System.Action<Avalonia.Size>)' does not exist in the implementation but it does exist in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.ITopLevelImpl.SetCursor(Avalonia.Platform.ICursorImpl)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.ITopLevelImpl.SetCursor(Avalonia.Platform.IPlatformHandle)' is present in the contract but not in the implementation.
 MembersMustExist : Member 'public void Avalonia.Platform.ITopLevelImpl.SetCursor(Avalonia.Platform.IPlatformHandle)' does not exist in the implementation but it does exist in the contract.
-Total Issues: 39
+InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IWindowBaseImpl.Show(System.Boolean)' is present in the contract but not in the implementation.
+MembersMustExist : Member 'public void Avalonia.Platform.IWindowBaseImpl.Show(System.Boolean)' does not exist in the implementation but it does exist in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IWindowBaseImpl.Show(System.Boolean, System.Boolean)' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IWindowImpl.Resize(Avalonia.Size)' is present in the contract but not in the implementation.
+MembersMustExist : Member 'public void Avalonia.Platform.IWindowImpl.Resize(Avalonia.Size)' does not exist in the implementation but it does exist in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IWindowImpl.Resize(Avalonia.Size, Avalonia.Platform.PlatformResizeReason)' is present in the implementation but not in the contract.
+Total Issues: 56
diff --git a/src/Avalonia.Controls/AppBuilderBase.cs b/src/Avalonia.Controls/AppBuilderBase.cs
index f616a42cac..d44b2ab0db 100644
--- a/src/Avalonia.Controls/AppBuilderBase.cs
+++ b/src/Avalonia.Controls/AppBuilderBase.cs
@@ -273,7 +273,7 @@ namespace Avalonia.Controls
         }
         
         /// <summary>
-        /// Sets up the platform-speciic services for the <see cref="Application"/>.
+        /// Sets up the platform-specific services for the <see cref="Application"/>.
         /// </summary>
         private void Setup()
         {
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
index aa4342f075..2a42d99ac5 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Threading;
 using Avalonia.Controls;
@@ -42,9 +43,13 @@ namespace Avalonia.Controls.ApplicationLifetimes
                     "Can not have multiple active ClassicDesktopStyleApplicationLifetime instances and the previously created one was not disposed");
             _activeLifetime = this;
         }
-        
+
         /// <inheritdoc/>
         public event EventHandler<ControlledApplicationLifetimeStartupEventArgs> Startup;
+
+        /// <inheritdoc/>
+        public event EventHandler<ShutdownRequestedEventArgs> ShutdownRequested;
+
         /// <inheritdoc/>
         public event EventHandler<ControlledApplicationLifetimeExitEventArgs> Exit;
 
@@ -111,6 +116,11 @@ namespace Avalonia.Controls.ApplicationLifetimes
                 ((IApplicationPlatformEvents)Application.Current).RaiseUrlsOpened(args);
             }
 
+            var lifetimeEvents = AvaloniaLocator.Current.GetService<IPlatformLifetimeEventsImpl>(); 
+
+            if (lifetimeEvents != null)
+                lifetimeEvents.ShutdownRequested += OnShutdownRequested;
+
             _cts = new CancellationTokenSource();
             MainWindow?.Show();
             Dispatcher.UIThread.MainLoop(_cts.Token);
@@ -123,6 +133,23 @@ namespace Avalonia.Controls.ApplicationLifetimes
             if (_activeLifetime == this)
                 _activeLifetime = null;
         }
+        
+        private void OnShutdownRequested(object sender, ShutdownRequestedEventArgs e)
+        {
+            ShutdownRequested?.Invoke(this, e);
+
+            if (e.Cancel)
+                return;
+
+            // When an OS shutdown request is received, try to close all non-owned windows. Windows can cancel
+            // shutdown by setting e.Cancel = true in the Closing event. Owned windows will be shutdown by their
+            // owners.
+            foreach (var w in Windows)
+                if (w.Owner is null)
+                    w.Close();
+            if (Windows.Count > 0)
+                e.Cancel = true;
+        }
     }
     
     public class ClassicDesktopStyleApplicationLifetimeOptions
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/IClassicDesktopStyleApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/IClassicDesktopStyleApplicationLifetime.cs
index 212f0b8617..a70d5dd2f1 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/IClassicDesktopStyleApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/IClassicDesktopStyleApplicationLifetime.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 
 namespace Avalonia.Controls.ApplicationLifetimes
 {
@@ -34,5 +35,23 @@ namespace Avalonia.Controls.ApplicationLifetimes
         Window MainWindow { get; set; }
         
         IReadOnlyList<Window> Windows { get; }
+
+        /// <summary>
+        /// Raised by the platform when an application shutdown is requested.
+        /// </summary>
+        /// <remarks>
+        /// Application Shutdown can be requested for various reasons like OS shutdown.
+        /// 
+        /// On Windows this will be called when an OS Session (logout or shutdown) terminates. Cancelling the eventargs will 
+        /// block OS shutdown.
+        /// 
+        /// On OSX this has the same behavior as on Windows and in addition:
+        /// This event is raised via the Quit menu or right-clicking on the application icon and selecting Quit. 
+        /// 
+        /// This event provides a first-chance to cancel application shutdown; if shutdown is not canceled at this point the application
+        /// will try to close each non-owned open window, invoking the <see cref="Window.Closing"/> event on each and allowing
+        /// each window to cancel the shutdown of the application. Windows cannot however prevent OS shutdown.
+        /// </remarks>
+        event EventHandler<ShutdownRequestedEventArgs> ShutdownRequested;
     }
 }
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/ShutdownRequestedEventArgs.cs b/src/Avalonia.Controls/ApplicationLifetimes/ShutdownRequestedEventArgs.cs
new file mode 100644
index 0000000000..62bc3a8904
--- /dev/null
+++ b/src/Avalonia.Controls/ApplicationLifetimes/ShutdownRequestedEventArgs.cs
@@ -0,0 +1,9 @@
+using System.ComponentModel;
+
+namespace Avalonia.Controls.ApplicationLifetimes
+{
+    public class ShutdownRequestedEventArgs : CancelEventArgs
+    {
+
+    }
+}
diff --git a/src/Avalonia.Controls/AutoCompleteBox.cs b/src/Avalonia.Controls/AutoCompleteBox.cs
index c656ba6f6c..5a6e78f441 100644
--- a/src/Avalonia.Controls/AutoCompleteBox.cs
+++ b/src/Avalonia.Controls/AutoCompleteBox.cs
@@ -2005,7 +2005,7 @@ namespace Avalonia.Controls
             // The TextBox.TextChanged event was not firing immediately and
             // was causing an immediate update, even with wrapping. If there is
             // a selection currently, no update should happen.
-            if (IsTextCompletionEnabled && TextBox != null && TextBoxSelectionLength > 0 && TextBoxSelectionStart != TextBox.Text.Length)
+            if (IsTextCompletionEnabled && TextBox != null && TextBoxSelectionLength > 0 && TextBoxSelectionStart != (TextBox.Text?.Length ?? 0))
             {
                 return;
             }
@@ -2303,7 +2303,7 @@ namespace Avalonia.Controls
             {
                 if (IsTextCompletionEnabled && TextBox != null && userInitiated)
                 {
-                    int currentLength = TextBox.Text.Length;
+                    int currentLength = TextBox.Text?.Length ?? 0;
                     int selectionStart = TextBoxSelectionStart;
                     if (selectionStart == text.Length && selectionStart > _textSelectionStart)
                     {
diff --git a/src/Avalonia.Controls/ComboBox.cs b/src/Avalonia.Controls/ComboBox.cs
index 89cfb5fa8f..57c07916db 100644
--- a/src/Avalonia.Controls/ComboBox.cs
+++ b/src/Avalonia.Controls/ComboBox.cs
@@ -91,6 +91,7 @@ namespace Avalonia.Controls
             FocusableProperty.OverrideDefaultValue<ComboBox>(true);
             SelectedItemProperty.Changed.AddClassHandler<ComboBox>((x,e) => x.SelectedItemChanged(e));
             KeyDownEvent.AddClassHandler<ComboBox>((x, e) => x.OnKeyDown(e), Interactivity.RoutingStrategies.Tunnel);
+            IsTextSearchEnabledProperty.OverrideDefaultValue<ComboBox>(true);
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/ContextMenu.cs b/src/Avalonia.Controls/ContextMenu.cs
index 57e4909e39..0c8fc31df1 100644
--- a/src/Avalonia.Controls/ContextMenu.cs
+++ b/src/Avalonia.Controls/ContextMenu.cs
@@ -1,12 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
+using Avalonia.Controls.Diagnostics;
 using Avalonia.Controls.Generators;
 using Avalonia.Controls.Platform;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Styling;
@@ -18,7 +21,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// A control context menu.
     /// </summary>
-    public class ContextMenu : MenuBase, ISetterValue
+    public class ContextMenu : MenuBase, ISetterValue, IPopupHostProvider
     {
         /// <summary>
         /// Defines the <see cref="HorizontalOffset"/> property.
@@ -79,6 +82,7 @@ namespace Avalonia.Controls
         private Popup? _popup;
         private List<Control>? _attachedControls;
         private IInputElement? _previousFocus;
+        private Action<IPopupHost?>? _popupHostChangedHandler;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ContextMenu"/> class.
@@ -220,7 +224,8 @@ namespace Avalonia.Controls
 
             if (e.OldValue is ContextMenu oldMenu)
             {
-                control.PointerReleased -= ControlPointerReleased;
+                control.ContextRequested -= ControlContextRequested;
+                control.DetachedFromVisualTree -= ControlDetachedFromVisualTree;
                 oldMenu._attachedControls?.Remove(control);
                 ((ISetLogicalParent?)oldMenu._popup)?.SetParent(null);
             }
@@ -229,7 +234,8 @@ namespace Avalonia.Controls
             {
                 newMenu._attachedControls ??= new List<Control>();
                 newMenu._attachedControls.Add(control);
-                control.PointerReleased += ControlPointerReleased;
+                control.ContextRequested += ControlContextRequested;
+                control.DetachedFromVisualTree += ControlDetachedFromVisualTree;
             }
         }
 
@@ -269,7 +275,7 @@ namespace Avalonia.Controls
             }
 
             control ??= _attachedControls![0];
-            Open(control, PlacementTarget ?? control);
+            Open(control, PlacementTarget ?? control, false);
         }
 
         /// <summary>
@@ -299,12 +305,20 @@ namespace Avalonia.Controls
             }
         }
 
+        IPopupHost? IPopupHostProvider.PopupHost => _popup?.Host;
+
+        event Action<IPopupHost?>? IPopupHostProvider.PopupHostChanged 
+        { 
+            add => _popupHostChangedHandler += value; 
+            remove => _popupHostChangedHandler -= value;
+        }
+
         protected override IItemContainerGenerator CreateItemContainerGenerator()
         {
             return new MenuItemContainerGenerator(this);
         }
 
-        private void Open(Control control, Control placementTarget)
+        private void Open(Control control, Control placementTarget, bool requestedByPointer)
         {
             if (IsOpen)
             {
@@ -329,6 +343,8 @@ namespace Avalonia.Controls
 
                 _popup.Opened += PopupOpened;
                 _popup.Closed += PopupClosed;
+                _popup.Closing += PopupClosing;
+                _popup.KeyUp += PopupKeyUp;
             }
 
             if (_popup.Parent != control)
@@ -337,6 +353,10 @@ namespace Avalonia.Controls
                 ((ISetLogicalParent)_popup).SetParent(control);
             }
 
+            _popup.PlacementMode = !requestedByPointer && PlacementMode == PlacementMode.Pointer
+                ? PlacementMode.Bottom
+                : PlacementMode;
+
             _popup.PlacementTarget = placementTarget;
             _popup.Child = this;
             IsOpen = true;
@@ -353,6 +373,13 @@ namespace Avalonia.Controls
         {
             _previousFocus = FocusManager.Instance?.Current;
             Focus();
+
+            _popupHostChangedHandler?.Invoke(_popup!.Host);
+        }
+
+        private void PopupClosing(object sender, CancelEventArgs e)
+        {
+            e.Cancel = CancelClosing();
         }
 
         private void PopupClosed(object sender, EventArgs e)
@@ -381,32 +408,47 @@ namespace Avalonia.Controls
                 RoutedEvent = MenuClosedEvent,
                 Source = this,
             });
+            
+            _popupHostChangedHandler?.Invoke(null);
         }
 
-        private static void ControlPointerReleased(object sender, PointerReleasedEventArgs e)
+        private void PopupKeyUp(object sender, KeyEventArgs e)
         {
-            var control = (Control)sender;
-            var contextMenu = control.ContextMenu;
-
-            if (control.ContextMenu.IsOpen)
+            if (IsOpen)
             {
-                if (contextMenu.CancelClosing())
-                    return;
+                var keymap = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>();
 
-                control.ContextMenu.Close();
-                e.Handled = true;
+                if (keymap.OpenContextMenu.Any(k => k.Matches(e))
+                    && !CancelClosing())
+                {
+                    Close();
+                    e.Handled = true;
+                }
             }
+        }
 
-            if (e.InitialPressMouseButton == MouseButton.Right)
+        private static void ControlContextRequested(object sender, ContextRequestedEventArgs e)
+        {
+            if (sender is Control control
+                && control.ContextMenu is ContextMenu contextMenu
+                && !e.Handled
+                && !contextMenu.CancelOpening())
             {
-                if (contextMenu.CancelOpening())
-                    return;
-
-                contextMenu.Open(control, e.Source as Control ?? control);
+                var requestedByPointer = e.TryGetPosition(null, out _);
+                contextMenu.Open(control, e.Source as Control ?? control, requestedByPointer);
                 e.Handled = true;
             }
         }
 
+        private static void ControlDetachedFromVisualTree(object sender, VisualTreeAttachmentEventArgs e)
+        {
+            if (sender is Control control
+                && control.ContextMenu is ContextMenu contextMenu)
+            {
+                contextMenu.Close();
+            }
+        }
+
         private bool CancelClosing()
         {
             var eventArgs = new CancelEventArgs();
diff --git a/src/Avalonia.Controls/ContextRequestedEventArgs.cs b/src/Avalonia.Controls/ContextRequestedEventArgs.cs
new file mode 100644
index 0000000000..8dc798245c
--- /dev/null
+++ b/src/Avalonia.Controls/ContextRequestedEventArgs.cs
@@ -0,0 +1,58 @@
+using Avalonia.Input;
+using Avalonia.Interactivity;
+
+#nullable enable
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Provides event data for the ContextRequested event.
+    /// </summary>
+    public class ContextRequestedEventArgs : RoutedEventArgs
+    {
+        private readonly PointerEventArgs? _pointerEventArgs;
+
+        /// <summary>
+        /// Initializes a new instance of the ContextRequestedEventArgs class.
+        /// </summary>
+        public ContextRequestedEventArgs()
+            : base(Control.ContextRequestedEvent)
+        {
+
+        }
+
+        /// <inheritdoc cref="ContextRequestedEventArgs()" />
+        public ContextRequestedEventArgs(PointerEventArgs pointerEventArgs)
+            : this()
+        {
+            _pointerEventArgs = pointerEventArgs;
+        }
+
+        /// <summary>
+        /// Gets the x- and y-coordinates of the pointer position, optionally evaluated against a coordinate origin of a supplied <see cref="Control"/>.
+        /// </summary>
+        /// <param name="relativeTo">
+        /// Any <see cref="Control"/>-derived object that is connected to the same object tree.
+        /// To specify the object relative to the overall coordinate system, use a relativeTo  value of null.
+        /// </param>
+        /// <param name="point">
+        /// A <see cref="Point"/> that represents the current x- and y-coordinates of the mouse pointer position.
+        /// If null was passed as relativeTo, this coordinate is for the overall window.
+        /// If a relativeTo value other than null was passed, this coordinate is relative to the object referenced by relativeTo.
+        /// </param>
+        /// <returns>
+        /// true if the context request was initiated by a pointer device; otherwise, false.
+        /// </returns>
+        public bool TryGetPosition(Control? relativeTo, out Point point)
+        {
+            if (_pointerEventArgs is null)
+            {
+                point = default;
+                return false;
+            }
+
+            point = _pointerEventArgs.GetPosition(relativeTo);
+            return true;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index a7ec7cc5d2..fe731b9d4b 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -3,6 +3,7 @@ using System.ComponentModel;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.Rendering;
 using Avalonia.Styling;
@@ -19,6 +20,7 @@ namespace Avalonia.Controls
     /// The control class extends <see cref="InputElement"/> and adds the following features:
     ///
     /// - A <see cref="Tag"/> property to allow user-defined data to be attached to the control.
+    /// - <see cref="ContextRequestedEvent"/> and other context menu related members.
     /// </remarks>
     public class Control : InputElement, IControl, INamed, IVisualBrushInitialize, ISetterValue
     {
@@ -52,6 +54,13 @@ namespace Avalonia.Controls
         public static readonly RoutedEvent<RequestBringIntoViewEventArgs> RequestBringIntoViewEvent =
             RoutedEvent.Register<Control, RequestBringIntoViewEventArgs>("RequestBringIntoView", RoutingStrategies.Bubble);
 
+        /// <summary>
+        /// Provides event data for the <see cref="ContextRequested"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<ContextRequestedEventArgs> ContextRequestedEvent =
+            RoutedEvent.Register<Control, ContextRequestedEventArgs>(nameof(ContextRequested),
+                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+
         private DataTemplates? _dataTemplates;
         private IControl? _focusAdorner;
 
@@ -100,6 +109,15 @@ namespace Avalonia.Controls
             set => SetValue(TagProperty, value);
         }
 
+        /// <summary>
+        /// Occurs when the user has completed a context input gesture, such as a right-click.
+        /// </summary>
+        public event EventHandler<ContextRequestedEventArgs> ContextRequested
+        {
+            add => AddHandler(ContextRequestedEvent, value);
+            remove => RemoveHandler(ContextRequestedEvent, value);
+        }
+
         public new IControl? Parent => (IControl?)base.Parent;
 
         /// <inheritdoc/>
@@ -208,5 +226,49 @@ namespace Avalonia.Controls
                 _focusAdorner = null;
             }
         }
+
+        protected override void OnPointerReleased(PointerReleasedEventArgs e)
+        {
+            base.OnPointerReleased(e);
+
+            if (e.Source == this
+                && !e.Handled
+                && e.InitialPressMouseButton == MouseButton.Right)
+            {
+                var args = new ContextRequestedEventArgs(e);
+                RaiseEvent(args);
+                e.Handled = args.Handled;
+            }
+        }
+
+        protected override void OnKeyUp(KeyEventArgs e)
+        {
+            base.OnKeyUp(e);
+
+            if (e.Source == this
+                && !e.Handled)
+            {
+                var keymap = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>().OpenContextMenu;
+                var matches = false;
+
+                for (var index = 0; index < keymap.Count; index++)
+                {
+                    var key = keymap[index];
+                    matches |= key.Matches(e);
+
+                    if (matches)
+                    {
+                        break;
+                    }
+                }
+
+                if (matches)
+                {
+                    var args = new ContextRequestedEventArgs();
+                    RaiseEvent(args);
+                    e.Handled = args.Handled;
+                }
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Converters/MarginMultiplierConverter.cs b/src/Avalonia.Controls/Converters/MarginMultiplierConverter.cs
index 9f3a6da9da..46affcbe33 100644
--- a/src/Avalonia.Controls/Converters/MarginMultiplierConverter.cs
+++ b/src/Avalonia.Controls/Converters/MarginMultiplierConverter.cs
@@ -26,13 +26,13 @@ namespace Avalonia.Controls.Converters
                     Right ? Indent * scalarDepth : 0,
                     Bottom ? Indent * scalarDepth : 0);
             }
-            else if (value is Thickness thinknessDepth)
+            else if (value is Thickness thicknessDepth)
             {
                 return new Thickness(
-                    Left ? Indent * thinknessDepth.Left : 0,
-                    Top ? Indent * thinknessDepth.Top : 0,
-                    Right ? Indent * thinknessDepth.Right : 0,
-                    Bottom ? Indent * thinknessDepth.Bottom : 0);
+                    Left ? Indent * thicknessDepth.Left : 0,
+                    Top ? Indent * thicknessDepth.Top : 0,
+                    Right ? Indent * thicknessDepth.Right : 0,
+                    Bottom ? Indent * thicknessDepth.Bottom : 0);
             }
             return new Thickness(0);
             
diff --git a/src/Avalonia.Controls/Converters/MenuScrollingVisibilityConverter.cs b/src/Avalonia.Controls/Converters/MenuScrollingVisibilityConverter.cs
index e6420fe342..65f95808ff 100644
--- a/src/Avalonia.Controls/Converters/MenuScrollingVisibilityConverter.cs
+++ b/src/Avalonia.Controls/Converters/MenuScrollingVisibilityConverter.cs
@@ -16,7 +16,7 @@ namespace Avalonia.Controls.Converters
             if (parameter == null ||
                 values == null ||
                 values.Count != 4 ||
-                !(values[0] is ScrollBarVisibility visiblity) ||
+                !(values[0] is ScrollBarVisibility visibility) ||
                 !(values[1] is double offset) ||
                 !(values[2] is double extent) ||
                 !(values[3] is double viewport))
@@ -24,7 +24,7 @@ namespace Avalonia.Controls.Converters
                 return AvaloniaProperty.UnsetValue;
             }
 
-            if (visiblity == ScrollBarVisibility.Auto)
+            if (visibility == ScrollBarVisibility.Auto)
             {
                 if (extent == viewport)
                 {
diff --git a/src/Avalonia.Controls/DateTimePickers/DatePicker.cs b/src/Avalonia.Controls/DateTimePickers/DatePicker.cs
index 43bc7d1df9..5893a02b04 100644
--- a/src/Avalonia.Controls/DateTimePickers/DatePicker.cs
+++ b/src/Avalonia.Controls/DateTimePickers/DatePicker.cs
@@ -71,7 +71,7 @@ namespace Avalonia.Controls
                 x => x.MonthVisible, (x, v) => x.MonthVisible = v);
 
         /// <summary>
-        /// Defiens the <see cref="YearFormat"/> Property
+        /// Defines the <see cref="YearFormat"/> Property
         /// </summary>
         public static readonly DirectProperty<DatePicker, string> YearFormatProperty =
             AvaloniaProperty.RegisterDirect<DatePicker, string>(nameof(YearFormat), 
diff --git a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
index a0e8c03195..e16e609a15 100644
--- a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
+++ b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
@@ -220,15 +220,15 @@ namespace Avalonia.Controls.Primitives
 
                 if (dy > 0) // Scroll Down
                 {
-                    int numContsToMove = 0;
+                    int numCountsToMove = 0;
                     for (int i = 0; i < children.Count; i++)
                     {
                         if (children[i].Bounds.Bottom - dy < 0)
-                            numContsToMove++;
+                            numCountsToMove++;
                         else
                             break;
                     }
-                    children.MoveRange(0, numContsToMove, children.Count);
+                    children.MoveRange(0, numCountsToMove, children.Count);
 
                     var scrollHeight = _extent.Height - Viewport.Height;
                     if (ShouldLoop && value.Y >= scrollHeight - _extentOne)
@@ -236,15 +236,15 @@ namespace Avalonia.Controls.Primitives
                 }
                 else if (dy < 0) // Scroll Up
                 {
-                    int numContsToMove = 0;
+                    int numCountsToMove = 0;
                     for (int i = children.Count - 1; i >= 0; i--)
                     {
                         if (children[i].Bounds.Top - dy > Bounds.Height)
-                            numContsToMove++;
+                            numCountsToMove++;
                         else
                             break;
                     }
-                    children.MoveRange(children.Count - numContsToMove, numContsToMove, 0);
+                    children.MoveRange(children.Count - numCountsToMove, numCountsToMove, 0);
                     if (ShouldLoop && value.Y < _extentOne)
                         _offset = new Vector(0, value.Y + (_extentOne * 50));
                 }
diff --git a/src/Avalonia.Controls/DefinitionBase.cs b/src/Avalonia.Controls/DefinitionBase.cs
index 3237f6f37b..37b8691ce9 100644
--- a/src/Avalonia.Controls/DefinitionBase.cs
+++ b/src/Avalonia.Controls/DefinitionBase.cs
@@ -35,7 +35,7 @@ namespace Avalonia.Controls
             if (_sharedState == null)
             {
                 //  start with getting SharedSizeGroup value. 
-                //  this property is NOT inhereted which should result in better overall perf.
+                //  this property is NOT inherited which should result in better overall perf.
                 string sharedSizeGroupId = SharedSizeGroup;
                 if (sharedSizeGroupId != null)
                 {
@@ -52,7 +52,7 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Callback to notify about exitting model tree.
+        /// Callback to notify about exiting model tree.
         /// </summary>
         internal void OnExitParentTree()
         {
@@ -458,7 +458,7 @@ namespace Avalonia.Controls
         private Grid.LayoutTimeSizeType _sizeType;      //  layout-time user size type. it may differ from _userSizeValueCache.UnitType when calculating "to-content"
 
         private double _minSize;                        //  used during measure to accumulate size for "Auto" and "Star" DefinitionBase's
-        private double _measureSize;                    //  size, calculated to be the input contstraint size for Child.Measure
+        private double _measureSize;                    //  size, calculated to be the input constraint size for Child.Measure
         private double _sizeCache;                      //  cache used for various purposes (sorting, caching, etc) during calculations
         private double _offset;                         //  offset of the DefinitionBase from left / top corner (assuming LTR case)
 
@@ -556,7 +556,7 @@ namespace Avalonia.Controls
             }
 
             /// <summary>
-            /// Propogates invalidations for all registered definitions.
+            /// Propagates invalidations for all registered definitions.
             /// Resets its own state.
             /// </summary>
             internal void Invalidate()
diff --git a/src/Avalonia.Controls/Diagnostics/IPopupHostProvider.cs b/src/Avalonia.Controls/Diagnostics/IPopupHostProvider.cs
new file mode 100644
index 0000000000..11d3b1792a
--- /dev/null
+++ b/src/Avalonia.Controls/Diagnostics/IPopupHostProvider.cs
@@ -0,0 +1,23 @@
+using System;
+using Avalonia.Controls.Primitives;
+
+#nullable enable
+
+namespace Avalonia.Controls.Diagnostics
+{
+    /// <summary>
+    /// Diagnostics interface to retrieve an associated <see cref="IPopupHost"/>.
+    /// </summary>
+    public interface IPopupHostProvider
+    {
+        /// <summary>
+        /// The popup host.
+        /// </summary>
+        IPopupHost? PopupHost { get; }
+
+        /// <summary>
+        /// Raised when the popup host changes.
+        /// </summary>
+        event Action<IPopupHost?>? PopupHostChanged;
+    }
+}
diff --git a/src/Avalonia.Controls/Diagnostics/ToolTipDiagnostics.cs b/src/Avalonia.Controls/Diagnostics/ToolTipDiagnostics.cs
new file mode 100644
index 0000000000..4acf2a217f
--- /dev/null
+++ b/src/Avalonia.Controls/Diagnostics/ToolTipDiagnostics.cs
@@ -0,0 +1,15 @@
+#nullable enable
+
+namespace Avalonia.Controls.Diagnostics
+{
+    /// <summary>
+    /// Helper class to provide diagnostics information for <see cref="ToolTip"/>.
+    /// </summary>
+    public static class ToolTipDiagnostics
+    {
+        /// <summary>
+        /// Provides access to the internal <see cref="ToolTip.ToolTipProperty"/> for use in DevTools.
+        /// </summary>
+        public static AvaloniaProperty<ToolTip?> ToolTipProperty = ToolTip.ToolTipProperty;
+    }
+}
diff --git a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs
index 83470f161d..e2afbd3bdc 100644
--- a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs
+++ b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs
@@ -31,7 +31,7 @@ namespace Avalonia.Controls.Embedding.Offscreen
             set
             {
                 _clientSize = value;
-                Resized?.Invoke(value);
+                Resized?.Invoke(value, PlatformResizeReason.Unspecified);
             }
         }
 
@@ -49,7 +49,7 @@ namespace Avalonia.Controls.Embedding.Offscreen
         
         public Action<RawInputEventArgs> Input { get; set; }
         public Action<Rect> Paint { get; set; }
-        public Action<Size> Resized { get; set; }
+        public Action<Size, PlatformResizeReason> Resized { get; set; }
         public Action<double> ScalingChanged { get; set; }
 
         public Action<WindowTransparencyLevel> TransparencyLevelChanged { get; set; }
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index e4b68c62fd..230b4954fe 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -1,16 +1,18 @@
 using System;
 using System.ComponentModel;
+using Avalonia.Controls.Diagnostics;
+using System.Linq;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Input.Raw;
 using Avalonia.Layout;
 using Avalonia.Logging;
-using Avalonia.Rendering;
 
 #nullable enable
 
 namespace Avalonia.Controls.Primitives
 {
-    public abstract class FlyoutBase : AvaloniaObject
+    public abstract class FlyoutBase : AvaloniaObject, IPopupHostProvider
     {
         static FlyoutBase()
         {
@@ -49,14 +51,21 @@ namespace Avalonia.Controls.Primitives
         public static readonly AttachedProperty<FlyoutBase?> AttachedFlyoutProperty =
             AvaloniaProperty.RegisterAttached<FlyoutBase, Control, FlyoutBase?>("AttachedFlyout", null);
 
+        private readonly Lazy<Popup> _popupLazy;
         private bool _isOpen;
         private Control? _target;
         private FlyoutShowMode _showMode = FlyoutShowMode.Standard;
         private Rect? _enlargedPopupRect;
         private PixelRect? _enlargePopupRectScreenPixelRect;
         private IDisposable? _transientDisposable;
+        private Action<IPopupHost?>? _popupHostChangedHandler;
 
-        protected Popup? Popup { get; private set; }
+        public FlyoutBase()
+        {
+            _popupLazy = new Lazy<Popup>(() => CreatePopup());
+        }
+
+        protected Popup Popup => _popupLazy.Value;
 
         /// <summary>
         /// Gets whether this Flyout is currently Open
@@ -94,6 +103,14 @@ namespace Avalonia.Controls.Primitives
             private set => SetAndRaise(TargetProperty, ref _target, value);
         }
 
+        IPopupHost? IPopupHostProvider.PopupHost => Popup?.Host;
+
+        event Action<IPopupHost?>? IPopupHostProvider.PopupHostChanged 
+        { 
+            add => _popupHostChangedHandler += value; 
+            remove => _popupHostChangedHandler -= value;
+        }
+
         public event EventHandler? Closed;
         public event EventHandler<CancelEventArgs>? Closing;
         public event EventHandler? Opened;
@@ -142,22 +159,19 @@ namespace Avalonia.Controls.Primitives
             HideCore();
         }
 
-        protected virtual void HideCore(bool canCancel = true)
+        /// <returns>True, if action was handled</returns>
+        protected virtual bool HideCore(bool canCancel = true)
         {
             if (!IsOpen)
             {
-                return;
+                return false;
             }
 
             if (canCancel)
             {
-                bool cancel = false;
-
-                var closing = new CancelEventArgs();
-                Closing?.Invoke(this, closing);
-                if (cancel || closing.Cancel)
+                if (CancelClosing())
                 {
-                    return;
+                    return false;
                 }
             }
 
@@ -170,31 +184,42 @@ namespace Avalonia.Controls.Primitives
             _enlargedPopupRect = null;
             _enlargePopupRectScreenPixelRect = null;
 
+            if (Target != null)
+            {
+                Target.DetachedFromVisualTree -= PlacementTarget_DetachedFromVisualTree;
+                Target.KeyUp -= OnPlacementTargetOrPopupKeyUp;
+            }
+
             OnClosed();
+
+            return true;
         }
 
-        protected virtual void ShowAtCore(Control placementTarget, bool showAtPointer = false)
+        /// <returns>True, if action was handled</returns>
+        protected virtual bool ShowAtCore(Control placementTarget, bool showAtPointer = false)
         {
             if (placementTarget == null)
-                throw new ArgumentNullException("placementTarget cannot be null");
-
-            if (Popup == null)
             {
-                InitPopup();
+                throw new ArgumentNullException(nameof(placementTarget));
             }
 
             if (IsOpen)
             {
                 if (placementTarget == Target)
                 {
-                    return;
+                    return false;
                 }
                 else // Close before opening a new one
                 {
-                    HideCore(false);
+                    _ = HideCore(false);
                 }
             }
 
+            if (CancelOpening())
+            {
+                return false;
+            }
+
             if (Popup.Parent != null && Popup.Parent != placementTarget)
             {
                 ((ISetLogicalParent)Popup).SetParent(null);
@@ -211,11 +236,13 @@ namespace Avalonia.Controls.Primitives
                 Popup.Child = CreatePresenter();
             }
 
-            OnOpening();
             PositionPopup(showAtPointer);
-            IsOpen = Popup.IsOpen = true;            
+            IsOpen = Popup.IsOpen = true;
             OnOpened();
-                        
+
+            placementTarget.DetachedFromVisualTree += PlacementTarget_DetachedFromVisualTree;
+            placementTarget.KeyUp += OnPlacementTargetOrPopupKeyUp;
+
             if (ShowMode == FlyoutShowMode.Standard)
             {
                 // Try and focus content inside Flyout
@@ -236,6 +263,13 @@ namespace Avalonia.Controls.Primitives
             {
                 _transientDisposable = InputManager.Instance?.Process.Subscribe(HandleTransientDismiss);
             }
+
+            return true;
+        }
+
+        private void PlacementTarget_DetachedFromVisualTree(object sender, VisualTreeAttachmentEventArgs e)
+        {
+            _ = HideCore(false);
         }
 
         private void HandleTransientDismiss(RawInputEventArgs args)
@@ -254,7 +288,7 @@ namespace Avalonia.Controls.Primitives
                 {
                     // Only do this once when the Flyout opens & cache the result
                     if (Popup?.Host is PopupRoot root)
-                    { 
+                    {
                         // Get the popup root bounds and convert to screen coordinates
                         
                         var tmp = root.Bounds.Inflate(100);
@@ -294,9 +328,9 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        protected virtual void OnOpening()
+        protected virtual void OnOpening(CancelEventArgs args)
         {
-            Opening?.Invoke(this, null);
+            Opening?.Invoke(this, args);
         }
 
         protected virtual void OnOpened()
@@ -320,30 +354,63 @@ namespace Avalonia.Controls.Primitives
         /// <returns></returns>
         protected abstract Control CreatePresenter();
 
-        private void InitPopup()
+        private Popup CreatePopup()
         {
-            Popup = new Popup();
-            Popup.WindowManagerAddShadowHint = false;
-            Popup.IsLightDismissEnabled = true;
-
-            Popup.Opened += OnPopupOpened;
-            Popup.Closed += OnPopupClosed;
+            var popup = new Popup();
+            popup.WindowManagerAddShadowHint = false;
+            popup.IsLightDismissEnabled = true;
+            popup.OverlayDismissEventPassThrough = true;
+
+            popup.Opened += OnPopupOpened;
+            popup.Closed += OnPopupClosed;
+            popup.Closing += OnPopupClosing;
+            popup.KeyUp += OnPlacementTargetOrPopupKeyUp;
+            return popup;
         }
 
         private void OnPopupOpened(object sender, EventArgs e)
         {
             IsOpen = true;
+
+            _popupHostChangedHandler?.Invoke(Popup!.Host);
+        }
+
+        private void OnPopupClosing(object sender, CancelEventArgs e)
+        {
+            if (IsOpen)
+            {
+                e.Cancel = CancelClosing();
+            }
         }
 
         private void OnPopupClosed(object sender, EventArgs e)
         {
-            HideCore();
+            HideCore(false);
+
+            _popupHostChangedHandler?.Invoke(null);
+        }
+
+        // This method is handling both popup logical tree and target logical tree.
+        private void OnPlacementTargetOrPopupKeyUp(object sender, KeyEventArgs e)
+        {
+            if (!e.Handled
+                && IsOpen
+                && Target?.ContextFlyout == this)
+            {
+                var keymap = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>();
+
+                if (keymap.OpenContextMenu.Any(k => k.Matches(e)))
+                {
+                    e.Handled = HideCore();
+                }
+            }
         }
 
         private void PositionPopup(bool showAtPointer)
         {
             Size sz;
-            if(Popup.Child.DesiredSize == Size.Empty)
+            // Popup.Child can't be null here, it was set in ShowAtCore.
+            if (Popup.Child!.DesiredSize == Size.Empty)
             {
                 // Popup may not have been shown yet. Measure content
                 sz = LayoutHelper.MeasureChild(Popup.Child, Size.Infinity, new Thickness());
@@ -370,19 +437,19 @@ namespace Avalonia.Controls.Primitives
             switch (Placement)
             {
                 case FlyoutPlacementMode.Top: //Above & centered
-                    Popup.PlacementRect = new Rect(0, 0, trgtBnds.Width-1, 1);
+                    Popup.PlacementRect = new Rect(0, 0, trgtBnds.Width - 1, 1);
                     Popup.PlacementGravity = PopupPositioning.PopupGravity.Top;
                     Popup.PlacementAnchor = PopupPositioning.PopupAnchor.Top;
                     break;
 
                 case FlyoutPlacementMode.TopEdgeAlignedLeft:
                     Popup.PlacementRect = new Rect(0, 0, 0, 0);
-                    Popup.PlacementGravity = PopupPositioning.PopupGravity.TopRight;                    
+                    Popup.PlacementGravity = PopupPositioning.PopupGravity.TopRight;
                     break;
 
                 case FlyoutPlacementMode.TopEdgeAlignedRight:
                     Popup.PlacementRect = new Rect(trgtBnds.Width - 1, 0, 10, 1);
-                    Popup.PlacementGravity = PopupPositioning.PopupGravity.TopLeft;                    
+                    Popup.PlacementGravity = PopupPositioning.PopupGravity.TopLeft;
                     break;
 
                 case FlyoutPlacementMode.RightEdgeAlignedTop:
@@ -454,38 +521,50 @@ namespace Avalonia.Controls.Primitives
             {
                 if (args.OldValue is FlyoutBase)
                 {
-                    c.PointerReleased -= OnControlWithContextFlyoutPointerReleased;
+                    c.ContextRequested -= OnControlContextRequested;
                 }
                 if (args.NewValue is FlyoutBase)
                 {
-                    c.PointerReleased += OnControlWithContextFlyoutPointerReleased;
+                    c.ContextRequested += OnControlContextRequested;
                 }
             }
         }
 
-        private static void OnControlWithContextFlyoutPointerReleased(object sender, PointerReleasedEventArgs e)
+        private static void OnControlContextRequested(object sender, ContextRequestedEventArgs e)
         {
-            if (sender is Control c)
+            var control = (Control)sender;
+            if (!e.Handled
+                && control.ContextFlyout is FlyoutBase flyout)
             {
-                if (e.InitialPressMouseButton == MouseButton.Right &&
-                e.GetCurrentPoint(c).Properties.PointerUpdateKind == PointerUpdateKind.RightButtonReleased)
+                if (control.ContextMenu != null)
                 {
-                    if (c.ContextFlyout != null)
-                    {
-                        if (c.ContextMenu != null)
-                        {
-                            Logger.TryGet(LogEventLevel.Verbose, "FlyoutBase")?.Log(c, "ContextMenu and ContextFlyout are both set, defaulting to ContextMenu");
-                            return;
-                        }
-                        c.ContextFlyout.ShowAt(c, true);
-                    }
+                    Logger.TryGet(LogEventLevel.Verbose, "FlyoutBase")?.Log(control, "ContextMenu and ContextFlyout are both set, defaulting to ContextMenu");
+                    return;
                 }
-            }            
+
+                // We do not support absolute popup positioning yet, so we ignore "point" at this moment.
+                var triggeredByPointerInput = e.TryGetPosition(null, out _);
+                e.Handled = flyout.ShowAtCore(control, triggeredByPointerInput);
+            }
+        }
+
+        private bool CancelClosing()
+        {
+            var eventArgs = new CancelEventArgs();
+            OnClosing(eventArgs);
+            return eventArgs.Cancel;
+        }
+
+        private bool CancelOpening()
+        {
+            var eventArgs = new CancelEventArgs();
+            OnOpening(eventArgs);
+            return eventArgs.Cancel;
         }
 
         internal static void SetPresenterClasses(IControl presenter, Classes classes)
         {
-            //Remove any classes no longer in use, ignoring pseudoclasses
+            //Remove any classes no longer in use, ignoring pseudo classes
             for (int i = presenter.Classes.Count - 1; i >= 0; i--)
             {
                 if (!classes.Contains(presenter.Classes[i]) &&
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs b/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs
index 10f97794d7..0f257224dd 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutPresenter.cs
@@ -6,15 +6,6 @@ namespace Avalonia.Controls
 {
     public class FlyoutPresenter : ContentControl
     {
-        public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
-            Border.CornerRadiusProperty.AddOwner<FlyoutPresenter>();
-
-        public CornerRadius CornerRadius
-        {
-            get => GetValue(CornerRadiusProperty);
-            set => SetValue(CornerRadiusProperty, value);
-        }
-
         protected override void OnKeyDown(KeyEventArgs e)
         {
             if (e.Key == Key.Escape)
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutShowMode.cs b/src/Avalonia.Controls/Flyouts/FlyoutShowMode.cs
index cb5b5f00c0..fe496619fd 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutShowMode.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutShowMode.cs
@@ -12,7 +12,7 @@
         Standard,
 
         /// <summary>
-        /// Behavior is typical of a flyout shown proactively. The open flyout does not take focus. For a CommandBarFlyout, it opens in it's collapsed state.
+        /// Behavior is typical of a flyout shown proactively. The open flyout does not take focus.
         /// </summary>
         Transient,
 
diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
index 92f414631a..3a45c85c70 100644
--- a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
+++ b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
@@ -29,16 +29,8 @@ namespace Avalonia.Controls
             var host = this.FindLogicalAncestorOfType<Popup>();
             if (host != null)
             {
-                for (int i = 0; i < LogicalChildren.Count; i++)
-                {
-                    if (LogicalChildren[i] is MenuItem item)
-                    {
-                        item.IsSubMenuOpen = false;
-                    }
-                }
-
                 SelectedIndex = -1;
-                host.IsOpen = false;                
+                host.IsOpen = false;
             }
         }
 
diff --git a/src/Avalonia.Controls/Grid.cs b/src/Avalonia.Controls/Grid.cs
index a14df1eb43..4e60b52f83 100644
--- a/src/Avalonia.Controls/Grid.cs
+++ b/src/Avalonia.Controls/Grid.cs
@@ -330,7 +330,7 @@ namespace Avalonia.Controls
                     //  value of Auto column), "cell 2 1" needs to be calculated first,
                     //  as it contributes to the Auto column's calculated value.
                     //  At the same time in order to accurately calculate constraint
-                    //  height for "cell 2 1", "cell 1 2" needs to be calcualted first,
+                    //  height for "cell 2 1", "cell 1 2" needs to be calculated first,
                     //  as it contributes to Auto row height, which is used in the
                     //  computation of Star row resolved height.
                     //
@@ -405,11 +405,11 @@ namespace Avalonia.Controls
                     //
                     //  where:
                     //  *   all [Measure GroupN] - regular children measure process -
-                    //      each cell is measured given contraint size as an input
+                    //      each cell is measured given constraint size as an input
                     //      and each cell's desired size is accumulated on the
                     //      corresponding column / row;
                     //  *   [Measure Group2'] - is when each cell is measured with
-                    //      infinit height as a constraint and a cell's desired
+                    //      infinite height as a constraint and a cell's desired
                     //      height is ignored;
                     //  *   [Measure Groups''] - is when each cell is measured (second
                     //      time during single Grid.MeasureOverride) regularly but its
@@ -780,7 +780,7 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Initializes DefinitionsU memeber either to user supplied ColumnDefinitions collection
+        /// Initializes DefinitionsU member either to user supplied ColumnDefinitions collection
         /// or to a default single element collection. DefinitionsU gets trimmed to size.
         /// </summary>
         /// <remarks>
@@ -821,7 +821,7 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Initializes DefinitionsV memeber either to user supplied RowDefinitions collection
+        /// Initializes DefinitionsV member either to user supplied RowDefinitions collection
         /// or to a default single element collection. DefinitionsV gets trimmed to size.
         /// </summary>
         /// <remarks>
@@ -2132,7 +2132,7 @@ namespace Avalonia.Controls
                 //
                 // Fortunately, our scenarios tend to have a small number of columns (~10 or fewer)
                 // each being allocated a large number of pixels (~50 or greater), and
-                // people don't even notice the kind of 1-pixel anomolies that are
+                // people don't even notice the kind of 1-pixel anomalies that are
                 // theoretically inevitable, or don't care if they do.  At least they shouldn't
                 // care - no one should be using the results WPF's grid layout to make
                 // quantitative decisions; its job is to produce a reasonable display, not
@@ -2597,7 +2597,7 @@ namespace Avalonia.Controls
             if (scale < 0.0)
             {
                 // if one of the *-weights is Infinity, adjust the weights by mapping
-                // Infinty to 1.0 and everything else to 0.0:  the infinite items share the
+                // Infinity to 1.0 and everything else to 0.0:  the infinite items share the
                 // available space equally, everyone else gets nothing.
                 return (Double.IsPositiveInfinity(def.UserSize.Value)) ? 1.0 : 0.0;
             }
@@ -2655,7 +2655,7 @@ namespace Avalonia.Controls
         private enum Flags
         {
             //
-            //  the foolowing flags let grid tracking dirtiness in more granular manner:
+            //  the following flags let grid tracking dirtiness in more granular manner:
             //  * Valid???Structure flags indicate that elements were added or removed.
             //  * Valid???Layout flags indicate that layout time portion of the information
             //    stored on the objects should be updated.
@@ -2684,7 +2684,7 @@ namespace Avalonia.Controls
 
         /// <summary>
         /// ShowGridLines property. This property is used mostly
-        /// for simplification of visual debuggig. When it is set
+        /// for simplification of visual debugging. When it is set
         /// to <c>true</c> grid lines are drawn to visualize location
         /// of grid lines.
         /// </summary>
diff --git a/src/Avalonia.Controls/ListBox.cs b/src/Avalonia.Controls/ListBox.cs
index f4185650bb..43b4908482 100644
--- a/src/Avalonia.Controls/ListBox.cs
+++ b/src/Avalonia.Controls/ListBox.cs
@@ -89,7 +89,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <remarks>
         /// Note that the selection mode only applies to selections made via user interaction.
-        /// Multiple selections can be made programatically regardless of the value of this property.
+        /// Multiple selections can be made programmatically regardless of the value of this property.
         /// </remarks>
         public new SelectionMode SelectionMode
         {
diff --git a/src/Avalonia.Controls/NativeMenuItemSeparator.cs b/src/Avalonia.Controls/NativeMenuItemSeparator.cs
index d3d3721c89..49b36e714d 100644
--- a/src/Avalonia.Controls/NativeMenuItemSeparator.cs
+++ b/src/Avalonia.Controls/NativeMenuItemSeparator.cs
@@ -3,7 +3,7 @@
 namespace Avalonia.Controls
 {
 
-    [Obsolete("This class exists to maintain backwards compatiblity with existing code. Use NativeMenuItemSeparator instead")]
+    [Obsolete("This class exists to maintain backwards compatibility with existing code. Use NativeMenuItemSeparator instead")]
     public class NativeMenuItemSeperator : NativeMenuItemSeparator 
     {
     }
diff --git a/src/Avalonia.Controls/Platform/ExtendClientAreaChromeHints.cs b/src/Avalonia.Controls/Platform/ExtendClientAreaChromeHints.cs
index bb3c0288eb..8513dd1697 100644
--- a/src/Avalonia.Controls/Platform/ExtendClientAreaChromeHints.cs
+++ b/src/Avalonia.Controls/Platform/ExtendClientAreaChromeHints.cs
@@ -25,7 +25,7 @@ namespace Avalonia.Platform
 
         /// <summary>
         /// Use system chrome where possible. OSX system chrome is used, Windows managed chrome is used.
-        /// This is because Windows Chrome can not be shown ontop of user content.
+        /// This is because Windows Chrome can not be shown on top of user content.
         /// </summary>
         PreferSystemChrome = 0x02,
 
diff --git a/src/Avalonia.Controls/Platform/IPlatformLifetimeEventsImpl.cs b/src/Avalonia.Controls/Platform/IPlatformLifetimeEventsImpl.cs
new file mode 100644
index 0000000000..4cd6640453
--- /dev/null
+++ b/src/Avalonia.Controls/Platform/IPlatformLifetimeEventsImpl.cs
@@ -0,0 +1,17 @@
+using System;
+using System.ComponentModel;
+using Avalonia.Controls.ApplicationLifetimes;
+
+namespace Avalonia.Platform
+{
+    public interface IPlatformLifetimeEventsImpl
+    {
+        /// <summary>
+        /// Raised by the platform when a shutdown is requested.
+        /// </summary>
+        /// <remarks>
+        /// Raised on on OSX via the Quit menu or right-clicking on the application icon and selecting Quit.
+        /// </remarks>
+        event EventHandler<ShutdownRequestedEventArgs> ShutdownRequested;
+    }
+}
diff --git a/src/Avalonia.Controls/Platform/ITopLevelImpl.cs b/src/Avalonia.Controls/Platform/ITopLevelImpl.cs
index 6e53233898..f4f4d29168 100644
--- a/src/Avalonia.Controls/Platform/ITopLevelImpl.cs
+++ b/src/Avalonia.Controls/Platform/ITopLevelImpl.cs
@@ -3,11 +3,46 @@ using System.Collections.Generic;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
+using Avalonia.Layout;
 using Avalonia.Rendering;
 using JetBrains.Annotations;
 
 namespace Avalonia.Platform
 {
+    /// <summary>
+    /// Describes the reason for a <see cref="ITopLevelImpl.Resized"/> message.
+    /// </summary>
+    public enum PlatformResizeReason
+    {
+        /// <summary>
+        /// The resize reason is unknown or unspecified.
+        /// </summary>
+        Unspecified,
+
+        /// <summary>
+        /// The resize was due to the user resizing the window, for example by dragging the
+        /// window frame.
+        /// </summary>
+        User,
+
+        /// <summary>
+        /// The resize was initiated by the application, for example by setting one of the sizing-
+        /// related properties on <see cref="Window"/> such as <see cref="Layoutable.Width"/> or
+        /// <see cref="Layoutable.Height"/>.
+        /// </summary>
+        Application,
+
+        /// <summary>
+        /// The resize was initiated by the layout system.
+        /// </summary>
+        Layout,
+
+        /// <summary>
+        /// The resize was due to a change in DPI.
+        /// </summary>
+        DpiChange,
+    }
+
     /// <summary>
     /// Defines a platform-specific top-level window implementation.
     /// </summary>
@@ -57,7 +92,7 @@ namespace Avalonia.Platform
         /// <summary>
         /// Gets or sets a method called when the toplevel is resized.
         /// </summary>
-        Action<Size> Resized { get; set; }
+        Action<Size, PlatformResizeReason> Resized { get; set; }
 
         /// <summary>
         /// Gets or sets a method called when the toplevel's scaling changes.
diff --git a/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs b/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs
index 0d303a6666..5172569726 100644
--- a/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs
+++ b/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs
@@ -7,7 +7,9 @@ namespace Avalonia.Platform
         /// <summary>
         /// Shows the window.
         /// </summary>
-        void Show(bool activate);
+        /// <param name="activate">Whether to activate the shown window.</param>
+        /// <param name="isDialog">Whether the window is being shown as a dialog.</param>
+        void Show(bool activate, bool isDialog);
 
         /// <summary>
         /// Hides the window.
diff --git a/src/Avalonia.Controls/Platform/IWindowImpl.cs b/src/Avalonia.Controls/Platform/IWindowImpl.cs
index 8a1554d344..17a90eddfe 100644
--- a/src/Avalonia.Controls/Platform/IWindowImpl.cs
+++ b/src/Avalonia.Controls/Platform/IWindowImpl.cs
@@ -110,7 +110,9 @@ namespace Avalonia.Platform
         /// <summary>
         /// Sets the client size of the top level.
         /// </summary>
-        void Resize(Size clientSize);
+        /// <param name="clientSize">The new client size.</param>
+        /// <param name="reason">The reason for the resize.</param>
+        void Resize(Size clientSize, PlatformResizeReason reason = PlatformResizeReason.Application);
 
         /// <summary>
         /// Sets the client size of the top level.
diff --git a/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs b/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs
index cb1291410a..a5495fdfc9 100644
--- a/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs
+++ b/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs
@@ -21,10 +21,12 @@ namespace Avalonia.Controls.Platform
 
         public void RunLoop(CancellationToken cancellationToken)
         {
-            while (true)
+            var handles = new[] { _signaled, cancellationToken.WaitHandle };
+
+            while (!cancellationToken.IsCancellationRequested)
             {
                 Signaled?.Invoke(null);
-                _signaled.WaitOne();
+                WaitHandle.WaitAny(handles);
             }
         }
 
diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
index 7c02832af6..2ead82f95d 100644
--- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
@@ -1,19 +1,33 @@
 using System;
 using System.Collections.Specialized;
-using System.Linq;
-using System.Resources;
 using Avalonia.Media;
 using Avalonia.Rendering;
-using Avalonia.Utilities;
 using Avalonia.VisualTree;
 
+#nullable enable
+
 namespace Avalonia.Controls.Primitives
 {
-    // TODO: Need to track position of adorned elements and move the adorner if they move.
+    /// <summary>
+    /// Represents a surface for showing adorners.
+    /// Adorners are always on top of the adorned element and are positioned to stay relative to the adorned element.
+    /// </summary>
+    /// <remarks>
+    /// TODO: Need to track position of adorned elements and move the adorner if they move.
+    /// </remarks>
     public class AdornerLayer : Canvas, ICustomSimpleHitTest
     {
-        public static readonly AttachedProperty<Visual> AdornedElementProperty =
-            AvaloniaProperty.RegisterAttached<AdornerLayer, Visual, Visual>("AdornedElement");
+        /// <summary>
+        /// Allows for getting and setting of the adorned element.
+        /// </summary>
+        public static readonly AttachedProperty<Visual?> AdornedElementProperty =
+            AvaloniaProperty.RegisterAttached<AdornerLayer, Visual, Visual?>("AdornedElement");
+
+        /// <summary>
+        /// Allows for controlling clipping of the adorner.
+        /// </summary>
+        public static readonly AttachedProperty<bool> IsClipEnabledProperty =
+            AvaloniaProperty.RegisterAttached<AdornerLayer, Visual, bool>("IsClipEnabled", true);
 
         private static readonly AttachedProperty<AdornedElementInfo> s_adornedElementInfoProperty =
             AvaloniaProperty.RegisterAttached<AdornerLayer, Visual, AdornedElementInfo>("AdornedElementInfo");
@@ -28,7 +42,7 @@ namespace Avalonia.Controls.Primitives
             Children.CollectionChanged += ChildrenCollectionChanged;
         }
 
-        public static Visual GetAdornedElement(Visual adorner)
+        public static Visual? GetAdornedElement(Visual adorner)
         {
             return adorner.GetValue(AdornedElementProperty);
         }
@@ -38,12 +52,19 @@ namespace Avalonia.Controls.Primitives
             adorner.SetValue(AdornedElementProperty, adorned);
         }
 
-        public static AdornerLayer GetAdornerLayer(IVisual visual)
+        public static AdornerLayer? GetAdornerLayer(IVisual visual)
+        {
+            return visual.FindAncestorOfType<VisualLayerManager>()?.AdornerLayer;
+        }
+
+        public static bool GetIsClipEnabled(Visual adorner)
         {
-            return visual.GetVisualAncestors()
-                .OfType<VisualLayerManager>()
-                .FirstOrDefault()
-                ?.AdornerLayer;
+            return adorner.GetValue(IsClipEnabledProperty);
+        }
+
+        public static void SetIsClipEnabled(Visual adorner, bool isClipEnabled)
+        {
+            adorner.SetValue(IsClipEnabledProperty, isClipEnabled);
         }
 
         protected override Size MeasureOverride(Size availableSize)
@@ -70,12 +91,13 @@ namespace Avalonia.Controls.Primitives
             foreach (var child in Children)
             {
                 var info = child.GetValue(s_adornedElementInfoProperty);
+                var isClipEnabled = child.GetValue(IsClipEnabledProperty);
 
                 if (info != null && info.Bounds.HasValue)
                 {
                     child.RenderTransform = new MatrixTransform(info.Bounds.Value.Transform);
                     child.RenderTransformOrigin = new RelativePoint(new Point(0,0), RelativeUnit.Absolute);
-                    UpdateClip(child, info.Bounds.Value);
+                    UpdateClip(child, info.Bounds.Value, isClipEnabled);
                     child.Arrange(info.Bounds.Value.Bounds);
                 }
                 else
@@ -87,16 +109,23 @@ namespace Avalonia.Controls.Primitives
             return finalSize;
         }
 
-        private static void AdornedElementChanged(AvaloniaPropertyChangedEventArgs e)
+        private static void AdornedElementChanged(AvaloniaPropertyChangedEventArgs<Visual?> e)
         {
             var adorner = (Visual)e.Sender;
-            var adorned = (Visual)e.NewValue;
+            var adorned = e.NewValue.GetValueOrDefault();
             var layer = adorner.GetVisualParent<AdornerLayer>();
             layer?.UpdateAdornedElement(adorner, adorned);
         }
 
-        private void UpdateClip(IControl control, TransformedBounds bounds)
+        private void UpdateClip(IControl control, TransformedBounds bounds, bool isEnabled)
         {
+            if (!isEnabled)
+            {
+                control.Clip = null;
+
+                return;
+            }
+
             if (!(control.Clip is RectangleGeometry clip))
             {
                 clip = new RectangleGeometry();
@@ -129,13 +158,13 @@ namespace Avalonia.Controls.Primitives
             InvalidateArrange();
         }
 
-        private void UpdateAdornedElement(Visual adorner, Visual adorned)
+        private void UpdateAdornedElement(Visual adorner, Visual? adorned)
         {
             var info = adorner.GetValue(s_adornedElementInfoProperty);
 
             if (info != null)
             {
-                info.Subscription.Dispose();
+                info.Subscription!.Dispose();
 
                 if (adorned == null)
                 {
@@ -163,7 +192,7 @@ namespace Avalonia.Controls.Primitives
 
         private class AdornedElementInfo
         {
-            public IDisposable Subscription { get; set; }
+            public IDisposable? Subscription { get; set; }
 
             public TransformedBounds? Bounds { get; set; }
         }
diff --git a/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs b/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs
index 762d8d37a6..403902f676 100644
--- a/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs
+++ b/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs
@@ -140,10 +140,5 @@ namespace Avalonia.Controls.Primitives
 
             return new OverlayPopupHost(overlayLayer);
         }
-
-        public override void Render(DrawingContext context)
-        {
-            context.FillRectangle(Brushes.White, new Rect(default, Bounds.Size));
-        }
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs
index b445de0472..d5fb69a672 100644
--- a/src/Avalonia.Controls/Primitives/Popup.cs
+++ b/src/Avalonia.Controls/Primitives/Popup.cs
@@ -1,6 +1,8 @@
 using System;
+using System.ComponentModel;
 using System.Linq;
 using System.Reactive.Disposables;
+using Avalonia.Controls.Diagnostics;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.Input;
@@ -17,7 +19,7 @@ namespace Avalonia.Controls.Primitives
     /// <summary>
     /// Displays a popup window.
     /// </summary>
-    public class Popup : Control, IVisualTreeHost
+    public class Popup : Control, IVisualTreeHost, IPopupHostProvider
     {
         public static readonly StyledProperty<bool> WindowManagerAddShadowHintProperty =
             AvaloniaProperty.Register<PopupRoot, bool>(nameof(WindowManagerAddShadowHint), true);
@@ -133,6 +135,7 @@ namespace Avalonia.Controls.Primitives
         private bool _ignoreIsOpenChanged;
         private PopupOpenState? _openState;
         private IInputElement _overlayInputPassThroughElement;
+        private Action<IPopupHost?>? _popupHostChangedHandler;
 
         /// <summary>
         /// Initializes static members of the <see cref="Popup"/> class.
@@ -154,6 +157,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public event EventHandler? Opened;
 
+        internal event EventHandler<CancelEventArgs>? Closing;
+
         public IPopupHost? Host => _openState?.PopupHost;
 
         public bool WindowManagerAddShadowHint
@@ -348,6 +353,14 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         IVisual? IVisualTreeHost.Root => _openState?.PopupHost.HostedVisualTreeRoot;
 
+        IPopupHost? IPopupHostProvider.PopupHost => Host;
+
+        event Action<IPopupHost?>? IPopupHostProvider.PopupHostChanged 
+        { 
+            add => _popupHostChangedHandler += value; 
+            remove => _popupHostChangedHandler -= value;
+        }
+
         /// <summary>
         /// Opens the popup.
         /// </summary>
@@ -479,6 +492,8 @@ namespace Avalonia.Controls.Primitives
             }
 
             Opened?.Invoke(this, EventArgs.Empty);
+
+            _popupHostChangedHandler?.Invoke(Host);
         }
 
         /// <summary>
@@ -567,6 +582,13 @@ namespace Avalonia.Controls.Primitives
 
         private void CloseCore()
         {
+            var closingArgs = new CancelEventArgs();
+            Closing?.Invoke(this, closingArgs);
+            if (closingArgs.Cancel)
+            {
+                return;
+            }
+
             _isOpenRequested = false;
             if (_openState is null)
             {
@@ -581,6 +603,8 @@ namespace Avalonia.Controls.Primitives
             _openState.Dispose();
             _openState = null;
 
+            _popupHostChangedHandler?.Invoke(null);
+
             using (BeginIgnoringIsOpen())
             {
                 IsOpen = false;
diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs
index dd839a0e9b..0f0dd7311d 100644
--- a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs
+++ b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs
@@ -27,7 +27,7 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
 
     /// <summary>
     /// An <see cref="IPopupPositioner"/> implementation for platforms on which a popup can be
-    /// aritrarily positioned.
+    /// arbitrarily positioned.
     /// </summary>
     public class ManagedPopupPositioner : IPopupPositioner
     {
diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs
index da7352b77f..1a11778db2 100644
--- a/src/Avalonia.Controls/Primitives/PopupRoot.cs
+++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs
@@ -161,12 +161,9 @@ namespace Avalonia.Controls.Primitives
 
         protected override sealed Size ArrangeSetBounds(Size size)
         {
-            using (BeginAutoSizing())
-            {
-                _positionerParameters.Size = size;
-                UpdatePosition();
-                return ClientSize;
-            }
+            _positionerParameters.Size = size;
+            UpdatePosition();
+            return ClientSize;
         }
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/RangeBase.cs b/src/Avalonia.Controls/Primitives/RangeBase.cs
index 0b716ec1ca..acb8e0f006 100644
--- a/src/Avalonia.Controls/Primitives/RangeBase.cs
+++ b/src/Avalonia.Controls/Primitives/RangeBase.cs
@@ -170,7 +170,7 @@ namespace Avalonia.Controls.Primitives
         }
 
         /// <summary>
-        /// Checks if the double value is not inifinity nor NaN.
+        /// Checks if the double value is not infinity nor NaN.
         /// </summary>
         /// <param name="value">The value.</param>
         private static bool ValidateDouble(double value)
diff --git a/src/Avalonia.Controls/Primitives/ScrollBar.cs b/src/Avalonia.Controls/Primitives/ScrollBar.cs
index d264ed76cc..d5d6af8bfa 100644
--- a/src/Avalonia.Controls/Primitives/ScrollBar.cs
+++ b/src/Avalonia.Controls/Primitives/ScrollBar.cs
@@ -57,6 +57,18 @@ namespace Avalonia.Controls.Primitives
         public static readonly StyledProperty<bool> AllowAutoHideProperty =
             AvaloniaProperty.Register<ScrollBar, bool>(nameof(AllowAutoHide), true);
 
+        /// <summary>
+        /// Defines the <see cref="HideDelay"/> property.
+        /// </summary>
+        public static readonly StyledProperty<TimeSpan> HideDelayProperty =
+            AvaloniaProperty.Register<ScrollBar, TimeSpan>(nameof(HideDelay), TimeSpan.FromSeconds(2));
+
+        /// <summary>
+        /// Defines the <see cref="ShowDelay"/> property.
+        /// </summary>
+        public static readonly StyledProperty<TimeSpan> ShowDelayProperty =
+            AvaloniaProperty.Register<ScrollBar, TimeSpan>(nameof(ShowDelay), TimeSpan.FromSeconds(0.5));
+
         private Button _lineUpButton;
         private Button _lineDownButton;
         private Button _pageUpButton;
@@ -126,6 +138,24 @@ namespace Avalonia.Controls.Primitives
             get => GetValue(AllowAutoHideProperty);
             set => SetValue(AllowAutoHideProperty, value);
         }
+        
+        /// <summary>
+        /// Gets a value that determines how long will be the hide delay after user stops interacting with the scrollbar.
+        /// </summary>
+        public TimeSpan HideDelay
+        {
+            get => GetValue(HideDelayProperty);
+            set => SetValue(HideDelayProperty, value);
+        }
+        
+        /// <summary>
+        /// Gets a value that determines how long will be the show delay when user starts interacting with the scrollbar.
+        /// </summary>
+        public TimeSpan ShowDelay
+        {
+            get => GetValue(ShowDelayProperty);
+            set => SetValue(ShowDelayProperty, value);
+        }
 
         public event EventHandler<ScrollEventArgs> Scroll;
 
@@ -296,12 +326,12 @@ namespace Avalonia.Controls.Primitives
 
         private void CollapseAfterDelay()
         {
-            InvokeAfterDelay(Collapse, TimeSpan.FromSeconds(2));
+            InvokeAfterDelay(Collapse, HideDelay);
         }
 
         private void ExpandAfterDelay()
         {
-            InvokeAfterDelay(Expand, TimeSpan.FromMilliseconds(400));
+            InvokeAfterDelay(Expand, ShowDelay);
         }
 
         private void Collapse()
diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
index 2fd08ef77c..07bc789cc1 100644
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@@ -96,7 +96,7 @@ namespace Avalonia.Controls.Primitives
         /// Defines the <see cref="IsTextSearchEnabled"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> IsTextSearchEnabledProperty =
-            AvaloniaProperty.Register<ItemsControl, bool>(nameof(IsTextSearchEnabled), true);
+            AvaloniaProperty.Register<ItemsControl, bool>(nameof(IsTextSearchEnabled), false);
 
         /// <summary>
         /// Event that should be raised by items that implement <see cref="ISelectable"/> to
@@ -328,7 +328,7 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         /// <remarks>
         /// Note that the selection mode only applies to selections made via user interaction.
-        /// Multiple selections can be made programatically regardless of the value of this property.
+        /// Multiple selections can be made programmatically regardless of the value of this property.
         /// </remarks>
         protected SelectionMode SelectionMode
         {
diff --git a/src/Avalonia.Controls/Primitives/TemplatedControl.cs b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
index 9c73ff2411..59975b072d 100644
--- a/src/Avalonia.Controls/Primitives/TemplatedControl.cs
+++ b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
@@ -5,7 +5,8 @@ using Avalonia.Logging;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.Styling;
-using Avalonia.VisualTree;
+
+#nullable enable
 
 namespace Avalonia.Controls.Primitives
 {
@@ -17,13 +18,13 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Defines the <see cref="Background"/> property.
         /// </summary>
-        public static readonly StyledProperty<IBrush> BackgroundProperty =
+        public static readonly StyledProperty<IBrush?> BackgroundProperty =
             Border.BackgroundProperty.AddOwner<TemplatedControl>();
 
         /// <summary>
         /// Defines the <see cref="BorderBrush"/> property.
         /// </summary>
-        public static readonly StyledProperty<IBrush> BorderBrushProperty =
+        public static readonly StyledProperty<IBrush?> BorderBrushProperty =
             Border.BorderBrushProperty.AddOwner<TemplatedControl>();
 
         /// <summary>
@@ -32,6 +33,12 @@ namespace Avalonia.Controls.Primitives
         public static readonly StyledProperty<Thickness> BorderThicknessProperty =
             Border.BorderThicknessProperty.AddOwner<TemplatedControl>();
 
+        /// <summary>
+        /// Defines the <see cref="CornerRadius"/> property.
+        /// </summary>
+        public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
+            Border.CornerRadiusProperty.AddOwner<TemplatedControl>();
+
         /// <summary>
         /// Defines the <see cref="FontFamily"/> property.
         /// </summary>
@@ -59,7 +66,7 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Defines the <see cref="Foreground"/> property.
         /// </summary>
-        public static readonly StyledProperty<IBrush> ForegroundProperty =
+        public static readonly StyledProperty<IBrush?> ForegroundProperty =
             TextBlock.ForegroundProperty.AddOwner<TemplatedControl>();
 
         /// <summary>
@@ -71,8 +78,8 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Defines the <see cref="Template"/> property.
         /// </summary>
-        public static readonly StyledProperty<IControlTemplate> TemplateProperty =
-            AvaloniaProperty.Register<TemplatedControl, IControlTemplate>(nameof(Template));
+        public static readonly StyledProperty<IControlTemplate?> TemplateProperty =
+            AvaloniaProperty.Register<TemplatedControl, IControlTemplate?>(nameof(Template));
 
         /// <summary>
         /// Defines the IsTemplateFocusTarget attached property.
@@ -88,7 +95,7 @@ namespace Avalonia.Controls.Primitives
                 "TemplateApplied", 
                 RoutingStrategies.Direct);
 
-        private IControlTemplate _appliedTemplate;
+        private IControlTemplate? _appliedTemplate;
 
         /// <summary>
         /// Initializes static members of the <see cref="TemplatedControl"/> class.
@@ -111,7 +118,7 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Gets or sets the brush used to draw the control's background.
         /// </summary>
-        public IBrush Background
+        public IBrush? Background
         {
             get { return GetValue(BackgroundProperty); }
             set { SetValue(BackgroundProperty, value); }
@@ -120,7 +127,7 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Gets or sets the brush used to draw the control's border.
         /// </summary>
-        public IBrush BorderBrush
+        public IBrush? BorderBrush
         {
             get { return GetValue(BorderBrushProperty); }
             set { SetValue(BorderBrushProperty, value); }
@@ -135,6 +142,15 @@ namespace Avalonia.Controls.Primitives
             set { SetValue(BorderThicknessProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the radius of the border rounded corners.
+        /// </summary>
+        public CornerRadius CornerRadius
+        {
+            get { return GetValue(CornerRadiusProperty); }
+            set { SetValue(CornerRadiusProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets the font family used to draw the control's text.
         /// </summary>
@@ -174,7 +190,7 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Gets or sets the brush used to draw the control's text and other foreground elements.
         /// </summary>
-        public IBrush Foreground
+        public IBrush? Foreground
         {
             get { return GetValue(ForegroundProperty); }
             set { SetValue(ForegroundProperty, value); }
@@ -192,7 +208,7 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Gets or sets the template that defines the control's appearance.
         /// </summary>
-        public IControlTemplate Template
+        public IControlTemplate? Template
         {
             get { return GetValue(TemplateProperty); }
             set { SetValue(TemplateProperty, value); }
@@ -265,7 +281,9 @@ namespace Avalonia.Controls.Primitives
 
                     var e = new TemplateAppliedEventArgs(nameScope);
                     OnApplyTemplate(e);
+#pragma warning disable CS0618 // Type or member is obsolete
                     OnTemplateApplied(e);
+#pragma warning restore CS0618 // Type or member is obsolete
                     RaiseEvent(e);
                 }
 
diff --git a/src/Avalonia.Controls/Primitives/Thumb.cs b/src/Avalonia.Controls/Primitives/Thumb.cs
index 348922b71d..91141058e4 100644
--- a/src/Avalonia.Controls/Primitives/Thumb.cs
+++ b/src/Avalonia.Controls/Primitives/Thumb.cs
@@ -56,6 +56,26 @@ namespace Avalonia.Controls.Primitives
         {
         }
 
+        protected override void OnPointerCaptureLost(PointerCaptureLostEventArgs e)
+        {
+            if (_lastPoint.HasValue)
+            {
+                var ev = new VectorEventArgs
+                {
+                    RoutedEvent = DragCompletedEvent,
+                    Vector = _lastPoint.Value,
+                };
+
+                _lastPoint = null;
+
+                RaiseEvent(ev);
+            }
+
+            PseudoClasses.Remove(":pressed");
+
+            base.OnPointerCaptureLost(e);
+        }
+
         protected override void OnPointerMoved(PointerEventArgs e)
         {
             if (_lastPoint.HasValue)
diff --git a/src/Avalonia.Controls/Repeater/IElementFactory.cs b/src/Avalonia.Controls/Repeater/IElementFactory.cs
index 6a899a6f26..f424ae29b7 100644
--- a/src/Avalonia.Controls/Repeater/IElementFactory.cs
+++ b/src/Avalonia.Controls/Repeater/IElementFactory.cs
@@ -46,7 +46,7 @@ namespace Avalonia.Controls
     }
 
     /// <summary>
-    /// A data template that supports creating and recyling elements for an <see cref="ItemsRepeater"/>.
+    /// A data template that supports creating and recycling elements for an <see cref="ItemsRepeater"/>.
     /// </summary>
     public interface IElementFactory : IDataTemplate
     {
diff --git a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
index fb2da09e73..01200e87e3 100644
--- a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
+++ b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
@@ -441,9 +441,9 @@ namespace Avalonia.Controls
             base.OnPropertyChanged(change);
         }
 
-        internal IControl GetElementImpl(int index, bool forceCreate, bool supressAutoRecycle)
+        internal IControl GetElementImpl(int index, bool forceCreate, bool suppressAutoRecycle)
         {
-            var element = _viewManager.GetElement(index, forceCreate, supressAutoRecycle);
+            var element = _viewManager.GetElement(index, forceCreate, suppressAutoRecycle);
             return element;
         }
 
diff --git a/src/Avalonia.Controls/Repeater/ViewManager.cs b/src/Avalonia.Controls/Repeater/ViewManager.cs
index cf2066b373..a7b6cf7f18 100644
--- a/src/Avalonia.Controls/Repeater/ViewManager.cs
+++ b/src/Avalonia.Controls/Repeater/ViewManager.cs
@@ -174,7 +174,7 @@ namespace Avalonia.Controls
             }
             else
             {
-                // We could not find a candiate.
+                // We could not find a candidate.
                 _lastFocusedElement = null;
             }
         }
diff --git a/src/Avalonia.Controls/Repeater/ViewportManager.cs b/src/Avalonia.Controls/Repeater/ViewportManager.cs
index da3c2b15e6..1a90da5830 100644
--- a/src/Avalonia.Controls/Repeater/ViewportManager.cs
+++ b/src/Avalonia.Controls/Repeater/ViewportManager.cs
@@ -186,7 +186,7 @@ namespace Avalonia.Controls
                 _expectedViewportShift.X + _layoutExtent.X - extent.X,
                 _expectedViewportShift.Y + _layoutExtent.Y - extent.Y);
 
-            // We tolerate viewport imprecisions up to 1 pixel to avoid invaliding layout too much.
+            // We tolerate viewport imprecisions up to 1 pixel to avoid invalidating layout too much.
             if (Math.Abs(_expectedViewportShift.X) > 1 || Math.Abs(_expectedViewportShift.Y) > 1)
             {
                 Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Expecting viewport shift of ({Shift})",
diff --git a/src/Avalonia.Controls/ScrollViewer.cs b/src/Avalonia.Controls/ScrollViewer.cs
index 559edeb204..eee6216587 100644
--- a/src/Avalonia.Controls/ScrollViewer.cs
+++ b/src/Avalonia.Controls/ScrollViewer.cs
@@ -653,7 +653,7 @@ namespace Avalonia.Controls
         private void CalculatedPropertiesChanged()
         {
             // Pass old values of 0 here because we don't have the old values at this point,
-            // and it shouldn't matter as only the template uses these properies.
+            // and it shouldn't matter as only the template uses these properties.
             RaisePropertyChanged(HorizontalScrollBarMaximumProperty, 0, HorizontalScrollBarMaximum);
             RaisePropertyChanged(HorizontalScrollBarValueProperty, 0, HorizontalScrollBarValue);
             RaisePropertyChanged(HorizontalScrollBarViewportSizeProperty, 0, HorizontalScrollBarViewportSize);
diff --git a/src/Avalonia.Controls/Selection/SelectionModel.cs b/src/Avalonia.Controls/Selection/SelectionModel.cs
index 6ae53a4d59..138a765b43 100644
--- a/src/Avalonia.Controls/Selection/SelectionModel.cs
+++ b/src/Avalonia.Controls/Selection/SelectionModel.cs
@@ -345,7 +345,7 @@ namespace Avalonia.Controls.Selection
         private protected override void OnSelectionChanged(IReadOnlyList<T> deselectedItems)
         {
             // Note: We're *not* putting this in a using scope. A collection update is still in progress
-            // so the operation won't get commited by normal means: we have to commit it manually.
+            // so the operation won't get committed by normal means: we have to commit it manually.
             var update = BatchUpdate();
 
             update.Operation.DeselectedItems = deselectedItems;
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index ddf55808ce..0eade8d6df 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -31,7 +31,7 @@ namespace Avalonia.Controls
 
         public static KeyGesture PasteGesture { get; } = AvaloniaLocator.Current
             .GetService<PlatformHotkeyConfiguration>()?.Paste.FirstOrDefault();
-        
+
         public static readonly StyledProperty<bool> AcceptsReturnProperty =
             AvaloniaProperty.Register<TextBox, bool>(nameof(AcceptsReturn));
 
@@ -117,7 +117,7 @@ namespace Avalonia.Controls
 
         public static readonly StyledProperty<bool> RevealPasswordProperty =
             AvaloniaProperty.Register<TextBox, bool>(nameof(RevealPassword));
-        
+
         public static readonly DirectProperty<TextBox, bool> CanCutProperty =
             AvaloniaProperty.RegisterDirect<TextBox, bool>(
                 nameof(CanCut),
@@ -135,7 +135,7 @@ namespace Avalonia.Controls
 
         public static readonly StyledProperty<bool> IsUndoEnabledProperty =
             AvaloniaProperty.Register<TextBox, bool>(
-                nameof(IsUndoEnabled), 
+                nameof(IsUndoEnabled),
                 defaultValue: true);
 
         public static readonly DirectProperty<TextBox, int> UndoLimitProperty =
@@ -157,6 +157,10 @@ namespace Avalonia.Controls
             }
 
             public bool Equals(UndoRedoState other) => ReferenceEquals(Text, other.Text) || Equals(Text, other.Text);
+
+            public override bool Equals(object obj) => obj is UndoRedoState other && Equals(other);
+
+            public override int GetHashCode() => Text.GetHashCode();
         }
 
         private string _text;
@@ -174,6 +178,10 @@ namespace Avalonia.Controls
         private string _newLine = Environment.NewLine;
         private static readonly string[] invalidCharacters = new String[1] { "\u007f" };
 
+        private int _selectedTextChangesMadeSinceLastUndoSnapshot;
+        private bool _hasDoneSnapshotOnce;
+        private const int _maxCharsBeforeUndoSnapshot = 7;
+
         static TextBox()
         {
             FocusableProperty.OverrideDefaultValue(typeof(TextBox), true);
@@ -202,7 +210,8 @@ namespace Avalonia.Controls
                 horizontalScrollBarVisibility,
                 BindingPriority.Style);
             _undoRedoHelper = new UndoRedoHelper<UndoRedoState>(this);
-
+            _selectedTextChangesMadeSinceLastUndoSnapshot = 0;
+            _hasDoneSnapshotOnce = false;
             UpdatePseudoclasses();
         }
 
@@ -331,6 +340,7 @@ namespace Avalonia.Controls
                     if (SetAndRaise(TextProperty, ref _text, value) && IsUndoEnabled && !_isUndoingRedoing)
                     {
                         _undoRedoHelper.Clear();
+                        SnapshotUndoRedo(); // so we always have an initial state
                     }
                 }
             }
@@ -341,16 +351,16 @@ namespace Avalonia.Controls
             get { return GetSelection(); }
             set
             {
-                SnapshotUndoRedo();
                 if (string.IsNullOrEmpty(value))
                 {
+                    _selectedTextChangesMadeSinceLastUndoSnapshot++;
+                    SnapshotUndoRedo(ignoreChangeCount: false);
                     DeleteSelection();
                 }
                 else
                 {
                     HandleTextInput(value);
                 }
-                SnapshotUndoRedo();
             }
         }
 
@@ -422,7 +432,7 @@ namespace Avalonia.Controls
             get { return _newLine; }
             set { SetAndRaise(NewLineProperty, ref _newLine, value); }
         }
-        
+
         /// <summary>
         /// Clears the current selection, maintaining the <see cref="CaretIndex"/>
         /// </summary>
@@ -480,11 +490,13 @@ namespace Avalonia.Controls
                     var oldValue = _undoRedoHelper.Limit;
                     _undoRedoHelper.Limit = value;
                     RaisePropertyChanged(UndoLimitProperty, oldValue, value);
-                } 
+                }
                 // from docs at
                 // https://docs.microsoft.com/en-us/dotnet/api/system.windows.controls.primitives.textboxbase.isundoenabled:
                 // "Setting UndoLimit clears the undo queue."
                 _undoRedoHelper.Clear();
+                _selectedTextChangesMadeSinceLastUndoSnapshot = 0;
+                _hasDoneSnapshotOnce = false;
             }
         }
 
@@ -515,6 +527,8 @@ namespace Avalonia.Controls
                 // Therefore, if you disable undo and then re-enable it, undo commands still do not work
                 // because the undo stack was emptied when you disabled undo."
                 _undoRedoHelper.Clear();
+                _selectedTextChangesMadeSinceLastUndoSnapshot = 0;
+                _hasDoneSnapshotOnce = false;
             }
         }
 
@@ -577,23 +591,25 @@ namespace Avalonia.Controls
             {
                 return;
             }
-            
+
             input = RemoveInvalidCharacters(input);
-            
+
             if (string.IsNullOrEmpty(input))
             {
                 return;
             }
-            
+            _selectedTextChangesMadeSinceLastUndoSnapshot++;
+            SnapshotUndoRedo(ignoreChangeCount: false);
+
             string text = Text ?? string.Empty;
             int caretIndex = CaretIndex;
             int newLength = input.Length + text.Length - Math.Abs(SelectionStart - SelectionEnd);
-            
+
             if (MaxLength > 0 && newLength > MaxLength)
             {
                 input = input.Remove(Math.Max(0, input.Length - (newLength - MaxLength)));
             }
-            
+
             if (!string.IsNullOrEmpty(input))
             {
                 DeleteSelection();
@@ -627,7 +643,6 @@ namespace Avalonia.Controls
             SnapshotUndoRedo();
             Copy();
             DeleteSelection();
-            SnapshotUndoRedo();
         }
 
         public async void Copy()
@@ -647,7 +662,6 @@ namespace Avalonia.Controls
 
             SnapshotUndoRedo();
             HandleTextInput(text);
-            SnapshotUndoRedo();
         }
 
         protected override void OnKeyDown(KeyEventArgs e)
@@ -696,6 +710,7 @@ namespace Avalonia.Controls
             {
                 try
                 {
+                    SnapshotUndoRedo();
                     _isUndoingRedoing = true;
                     _undoRedoHelper.Undo();
                 }
@@ -830,7 +845,6 @@ namespace Avalonia.Controls
                             CaretIndex -= removedCharacters;
                             ClearSelection();
                         }
-                        SnapshotUndoRedo();
 
                         handled = true;
                         break;
@@ -858,7 +872,6 @@ namespace Avalonia.Controls
                             SetTextInternal(text.Substring(0, caretIndex) +
                                             text.Substring(caretIndex + removedCharacters));
                         }
-                        SnapshotUndoRedo();
 
                         handled = true;
                         break;
@@ -868,7 +881,6 @@ namespace Avalonia.Controls
                         {
                             SnapshotUndoRedo();
                             HandleTextInput(NewLine);
-                            SnapshotUndoRedo();
                             handled = true;
                         }
 
@@ -879,7 +891,6 @@ namespace Avalonia.Controls
                         {
                             SnapshotUndoRedo();
                             HandleTextInput("\t");
-                            SnapshotUndoRedo();
                             handled = true;
                         }
                         else
@@ -889,6 +900,10 @@ namespace Avalonia.Controls
 
                         break;
 
+                    case Key.Space:
+                        SnapshotUndoRedo(); // always snapshot in between words
+                        break;
+
                     default:
                         handled = false;
                         break;
@@ -1098,6 +1113,11 @@ namespace Avalonia.Controls
 
         private bool MoveVertical(int count)
         {
+            if (_presenter is null)
+            {
+                return false;
+            }
+
             var formattedText = _presenter.FormattedText;
             var lines = formattedText.GetLines().ToList();
             var caretIndex = CaretIndex;
@@ -1113,14 +1133,17 @@ namespace Avalonia.Controls
                 CaretIndex = hit.TextPosition + (hit.IsTrailing ? 1 : 0);
                 return true;
             }
-            else
-            {
-                return false;
-            }
+
+            return false;
         }
 
         private void MoveHome(bool document)
         {
+            if (_presenter is null)
+            {
+                return;
+            }
+            
             var text = Text ?? string.Empty;
             var caretIndex = CaretIndex;
 
@@ -1151,6 +1174,11 @@ namespace Avalonia.Controls
 
         private void MoveEnd(bool document)
         {
+            if (_presenter is null)
+            {
+                return;
+            }
+            
             var text = Text ?? string.Empty;
             var caretIndex = CaretIndex;
 
@@ -1306,11 +1334,19 @@ namespace Avalonia.Controls
             }
         }
 
-        private void SnapshotUndoRedo()
+        private void SnapshotUndoRedo(bool ignoreChangeCount = true)
         {
             if (IsUndoEnabled)
             {
-                _undoRedoHelper.Snapshot();
+                if (ignoreChangeCount ||
+                    !_hasDoneSnapshotOnce ||
+                    (!ignoreChangeCount &&
+                        _selectedTextChangesMadeSinceLastUndoSnapshot >= _maxCharsBeforeUndoSnapshot))
+                {
+                    _undoRedoHelper.Snapshot();
+                    _selectedTextChangesMadeSinceLastUndoSnapshot = 0;
+                    _hasDoneSnapshotOnce = true;
+                }
             }
         }
     }
diff --git a/src/Avalonia.Controls/TickBar.cs b/src/Avalonia.Controls/TickBar.cs
index 237bc2ce1d..12ae766052 100644
--- a/src/Avalonia.Controls/TickBar.cs
+++ b/src/Avalonia.Controls/TickBar.cs
@@ -193,7 +193,7 @@ namespace Avalonia.Controls
 
         /// <summary>
         /// TickBar will use ReservedSpaceProperty for left and right spacing (for horizontal orientation) or
-        /// top and bottom spacing (for vertical orienation).
+        /// top and bottom spacing (for vertical orientation).
         /// The space on both sides of TickBar is half of specified ReservedSpace.
         /// This property has type of <see cref="Rect" />.
         /// </summary>
@@ -210,7 +210,7 @@ namespace Avalonia.Controls
         /// This function also draw selection-tick(s) if IsSelectionRangeEnabled is 'true' and
         /// SelectionStart and SelectionEnd are valid.
         ///
-        /// The primary ticks (for Mininum and Maximum value) height will be 100% of TickBar's render size (use Width or Height
+        /// The primary ticks (for Minimum and Maximum value) height will be 100% of TickBar's render size (use Width or Height
         /// depends on Placement property).
         ///
         /// The secondary ticks (all other ticks, including selection-tics) height will be 75% of TickBar's render size.
@@ -221,7 +221,7 @@ namespace Avalonia.Controls
         {
             var size = new Size(Bounds.Width, Bounds.Height);
             var range = Maximum - Minimum;
-            var tickLen = 0.0d;   // Height for Primary Tick (for Mininum and Maximum value)
+            var tickLen = 0.0d;   // Height for Primary Tick (for Minimum and Maximum value)
             var tickLen2 = 0.0d;  // Height for Secondary Tick
             var logicalToPhysical = 1.0;
             var startPoint = new Point();
@@ -285,7 +285,7 @@ namespace Avalonia.Controls
 
             tickLen2 = tickLen * 0.75;
 
-            // Invert direciton of the ticks
+            // Invert direction of the ticks
             if (IsDirectionReversed)
             {
                 logicalToPhysical *= -1;
diff --git a/src/Avalonia.Controls/ToolTip.cs b/src/Avalonia.Controls/ToolTip.cs
index ab507d07a2..ab310d60ef 100644
--- a/src/Avalonia.Controls/ToolTip.cs
+++ b/src/Avalonia.Controls/ToolTip.cs
@@ -1,9 +1,8 @@
 #nullable enable
 using System;
-using System.Reactive.Linq;
+using Avalonia.Controls.Diagnostics;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
 {
@@ -17,7 +16,7 @@ namespace Avalonia.Controls
     /// assigning the content that you want displayed.
     /// </remarks>
     [PseudoClasses(":open")]
-    public class ToolTip : ContentControl
+    public class ToolTip : ContentControl, IPopupHostProvider
     {
         /// <summary>
         /// Defines the ToolTip.Tip attached property.
@@ -61,7 +60,8 @@ namespace Avalonia.Controls
         internal static readonly AttachedProperty<ToolTip?> ToolTipProperty =
             AvaloniaProperty.RegisterAttached<ToolTip, Control, ToolTip?>("ToolTip");
 
-        private IPopupHost? _popup;
+        private IPopupHost? _popupHost;
+        private Action<IPopupHost?>? _popupHostChangedHandler;
 
         /// <summary>
         /// Initializes static members of the <see cref="ToolTip"/> class.
@@ -251,35 +251,45 @@ namespace Avalonia.Controls
 
             tooltip.RecalculatePosition(control);
         }
+        
+        IPopupHost? IPopupHostProvider.PopupHost => _popupHost;
+
+        event Action<IPopupHost?>? IPopupHostProvider.PopupHostChanged 
+        { 
+            add => _popupHostChangedHandler += value; 
+            remove => _popupHostChangedHandler -= value;
+        }
 
         internal void RecalculatePosition(Control control)
         {
-            _popup?.ConfigurePosition(control, GetPlacement(control), new Point(GetHorizontalOffset(control), GetVerticalOffset(control)));
+            _popupHost?.ConfigurePosition(control, GetPlacement(control), new Point(GetHorizontalOffset(control), GetVerticalOffset(control)));
         }
 
         private void Open(Control control)
         {
             Close();
 
-            _popup = OverlayPopupHost.CreatePopupHost(control, null);
-            _popup.SetChild(this);
-            ((ISetLogicalParent)_popup).SetParent(control);
+            _popupHost = OverlayPopupHost.CreatePopupHost(control, null);
+            _popupHost.SetChild(this);
+            ((ISetLogicalParent)_popupHost).SetParent(control);
             
-            _popup.ConfigurePosition(control, GetPlacement(control), 
+            _popupHost.ConfigurePosition(control, GetPlacement(control), 
                 new Point(GetHorizontalOffset(control), GetVerticalOffset(control)));
 
-            WindowManagerAddShadowHintChanged(_popup, false);
+            WindowManagerAddShadowHintChanged(_popupHost, false);
 
-            _popup.Show();
+            _popupHost.Show();
+            _popupHostChangedHandler?.Invoke(_popupHost);
         }
 
         private void Close()
         {
-            if (_popup != null)
+            if (_popupHost != null)
             {
-                _popup.SetChild(null);
-                _popup.Dispose();
-                _popup = null;
+                _popupHost.SetChild(null);
+                _popupHost.Dispose();
+                _popupHost = null;
+                _popupHostChangedHandler?.Invoke(null);
             }
         }
 
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 7028dca769..5d9a0c8eed 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -90,6 +90,7 @@ namespace Avalonia.Controls
         /// </summary>
         static TopLevel()
         {
+            KeyboardNavigation.TabNavigationProperty.OverrideDefaultValue<TopLevel>(KeyboardNavigationMode.Cycle);
             AffectsMeasure<TopLevel>(ClientSizeProperty);
 
             TransparencyLevelHintProperty.Changed.AddClassHandler<TopLevel>(
@@ -224,7 +225,7 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Gets the acheived <see cref="WindowTransparencyLevel"/> that the platform was able to provide.
+        /// Gets the achieved <see cref="WindowTransparencyLevel"/> that the platform was able to provide.
         /// </summary>
         public WindowTransparencyLevel ActualTransparencyLevel
         {
@@ -376,11 +377,15 @@ namespace Avalonia.Controls
             LayoutManager?.Dispose();
         }
 
+        [Obsolete("Use HandleResized(Size, PlatformResizeReason)")]
+        protected virtual void HandleResized(Size clientSize) => HandleResized(clientSize, PlatformResizeReason.Unspecified);
+
         /// <summary>
         /// Handles a resize notification from <see cref="ITopLevelImpl.Resized"/>.
         /// </summary>
         /// <param name="clientSize">The new client size.</param>
-        protected virtual void HandleResized(Size clientSize)
+        /// <param name="reason">The reason for the resize.</param>
+        protected virtual void HandleResized(Size clientSize, PlatformResizeReason reason)
         {
             ClientSize = clientSize;
             FrameSize = PlatformImpl.FrameSize;
diff --git a/src/Avalonia.Controls/Utils/UndoRedoHelper.cs b/src/Avalonia.Controls/Utils/UndoRedoHelper.cs
index 7374f20a0c..fd1ca54b57 100644
--- a/src/Avalonia.Controls/Utils/UndoRedoHelper.cs
+++ b/src/Avalonia.Controls/Utils/UndoRedoHelper.cs
@@ -7,7 +7,7 @@ using Avalonia.Utilities;
 
 namespace Avalonia.Controls.Utils
 {
-    class UndoRedoHelper<TState> : WeakTimer.IWeakTimerSubscriber where TState : struct, IEquatable<TState>
+    class UndoRedoHelper<TState>
     {
         private readonly IUndoRedoHost _host;
 
@@ -31,7 +31,6 @@ namespace Avalonia.Controls.Utils
         public UndoRedoHelper(IUndoRedoHost host)
         {
             _host = host;
-            WeakTimer.StartWeakTimer(this, TimeSpan.FromSeconds(1));
         }
 
         public void Undo()
@@ -61,7 +60,7 @@ namespace Avalonia.Controls.Utils
             if (_states.Last != null)
             {
                 _states.Last.Value = state;
-            } 
+            }
         }
 
         public void UpdateLastState()
@@ -103,11 +102,5 @@ namespace Avalonia.Controls.Utils
             _states.Clear();
             _currentNode = null;
         }
-
-        bool WeakTimer.IWeakTimerSubscriber.Tick()
-        {
-            Snapshot();
-            return true;
-        }
     }
 }
diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index ae314a33ce..0ca28ca196 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -244,7 +244,7 @@ namespace Avalonia.Controls
             impl.WindowStateChanged = HandleWindowStateChanged;
             _maxPlatformClientSize = PlatformImpl?.MaxAutoSizeHint ?? default(Size);
             impl.ExtendClientAreaToDecorationsChanged = ExtendClientAreaToDecorationsChanged;            
-            this.GetObservable(ClientSizeProperty).Skip(1).Subscribe(x => PlatformImpl?.Resize(x));
+            this.GetObservable(ClientSizeProperty).Skip(1).Subscribe(x => PlatformImpl?.Resize(x, PlatformResizeReason.Application));
 
             PlatformImpl?.ShowTaskbarIcon(ShowInTaskbar);
         }
@@ -258,6 +258,18 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets a value indicating how the window will size itself to fit its content.
         /// </summary>
+        /// <remarks>
+        /// If <see cref="SizeToContent"/> has a value other than <see cref="SizeToContent.Manual"/>,
+        /// <see cref="SizeToContent"/> is automatically set to <see cref="SizeToContent.Manual"/>
+        /// if a user resizes the window by using the resize grip or dragging the border.
+        /// 
+        /// NOTE: Because of a limitation of X11, <see cref="SizeToContent"/> will be reset on X11 to
+        /// <see cref="SizeToContent.Manual"/> on any resize - including the resize that happens when
+        /// the window is first shown. This is because X11 resize notifications are asynchronous and
+        /// there is no way to know whether a resize came from the user or the layout system. To avoid
+        /// this, consider setting <see cref="CanResize"/> to false, which will disable user resizing
+        /// of the window.
+        /// </remarks>
         public SizeToContent SizeToContent
         {
             get { return GetValue(SizeToContentProperty); }
@@ -583,28 +595,23 @@ namespace Avalonia.Controls
                 return;
             }
 
-            using (BeginAutoSizing())
-            {
-                Renderer?.Stop();
+            Renderer?.Stop();
 
-                if (Owner is Window owner)
-                {
-                    owner.RemoveChild(this);
-                }
+            if (Owner is Window owner)
+            {
+                owner.RemoveChild(this);
+            }
 
-                if (_children.Count > 0)
+            if (_children.Count > 0)
+            {
+                foreach (var child in _children.ToArray())
                 {
-                    foreach (var child in _children.ToArray())
-                    {
-                        child.child.Hide();
-                    }
+                    child.child.Hide();
                 }
-
-                Owner = null;
-
-                PlatformImpl?.Hide();
             }
 
+            Owner = null;
+            PlatformImpl?.Hide();
             IsVisible = false;
         }
 
@@ -675,29 +682,23 @@ namespace Avalonia.Controls
 
             if (initialSize != ClientSize)
             {
-                using (BeginAutoSizing())
-                {
-                    PlatformImpl?.Resize(initialSize);
-                }
+                PlatformImpl?.Resize(initialSize, PlatformResizeReason.Layout);
             }
 
             LayoutManager.ExecuteInitialLayoutPass();
 
-            using (BeginAutoSizing())
+            if (parent != null)
             {
-                if (parent != null)
-                {
-                    PlatformImpl?.SetParent(parent.PlatformImpl);
-                }
-                
-                Owner = parent;
-                parent?.AddChild(this, false);
-                
-                SetWindowStartupLocation(Owner?.PlatformImpl);
-                
-                PlatformImpl?.Show(ShowActivated);
-                Renderer?.Start();                
+                PlatformImpl?.SetParent(parent.PlatformImpl);
             }
+
+            Owner = parent;
+            parent?.AddChild(this, false);
+
+            SetWindowStartupLocation(Owner?.PlatformImpl);
+
+            PlatformImpl?.Show(ShowActivated, false);
+            Renderer?.Start();
             OnOpened(EventArgs.Empty);
         }
 
@@ -760,41 +761,34 @@ namespace Avalonia.Controls
 
             if (initialSize != ClientSize)
             {
-                using (BeginAutoSizing())
-                {
-                    PlatformImpl?.Resize(initialSize);
-                }
+                PlatformImpl?.Resize(initialSize, PlatformResizeReason.Layout);
             }
 
             LayoutManager.ExecuteInitialLayoutPass();
 
             var result = new TaskCompletionSource<TResult>();
 
-            using (BeginAutoSizing())
-            {
-                PlatformImpl?.SetParent(owner.PlatformImpl);
-                Owner = owner;
-                owner.AddChild(this, true);
-                
-                SetWindowStartupLocation(owner.PlatformImpl);
-                
-                PlatformImpl?.Show(ShowActivated);
+            PlatformImpl?.SetParent(owner.PlatformImpl);
+            Owner = owner;
+            owner.AddChild(this, true);
 
-                Renderer?.Start();
+            SetWindowStartupLocation(owner.PlatformImpl);
 
-                Observable.FromEventPattern<EventHandler, EventArgs>(
-                        x => Closed += x,
-                        x => Closed -= x)
-                    .Take(1)
-                    .Subscribe(_ =>
-                    {
-                        owner.Activate();
-                        result.SetResult((TResult)(_dialogResult ?? default(TResult)));
-                    });
+            PlatformImpl?.Show(ShowActivated, true);
 
-                OnOpened(EventArgs.Empty);
-            }
+            Renderer?.Start();
+
+            Observable.FromEventPattern<EventHandler, EventArgs>(
+                    x => Closed += x,
+                    x => Closed -= x)
+                .Take(1)
+                .Subscribe(_ =>
+                {
+                    owner.Activate();
+                    result.SetResult((TResult)(_dialogResult ?? default(TResult)));
+                });
 
+            OnOpened(EventArgs.Empty);
             return result.Task;
         }
 
@@ -937,11 +931,8 @@ namespace Avalonia.Controls
 
         protected sealed override Size ArrangeSetBounds(Size size)
         {
-            using (BeginAutoSizing())
-            {
-                PlatformImpl?.Resize(size);
-                return ClientSize;
-            }
+            PlatformImpl?.Resize(size, PlatformResizeReason.Layout);
+            return ClientSize;
         }
 
         protected sealed override void HandleClosed()
@@ -958,18 +949,36 @@ namespace Avalonia.Controls
             Owner = null;
         }
 
+        [Obsolete("Use HandleResized(Size, PlatformResizeReason)")]
+        protected sealed override void HandleResized(Size clientSize) => HandleResized(clientSize, PlatformResizeReason.Unspecified);
+
         /// <inheritdoc/>
-        protected sealed override void HandleResized(Size clientSize)
+        protected sealed override void HandleResized(Size clientSize, PlatformResizeReason reason)
         {
-            if (!AutoSizing)
+            if (ClientSize == clientSize)
+                return;
+
+            var sizeToContent = SizeToContent;
+
+            // If auto-sizing is enabled, and the resize came from a user resize (or the reason was
+            // unspecified) then turn off auto-resizing for any window dimension that is not equal
+            // to the requested size.
+            if (sizeToContent != SizeToContent.Manual &&
+                CanResize &&
+                reason == PlatformResizeReason.Unspecified ||  
+                reason == PlatformResizeReason.User)
             {
-                SizeToContent = SizeToContent.Manual;
+                if (clientSize.Width != ClientSize.Width)
+                    sizeToContent &= ~SizeToContent.Width;
+                if (clientSize.Height != ClientSize.Height)
+                    sizeToContent &= ~SizeToContent.Height;
+                SizeToContent = sizeToContent;
             }
 
             Width = clientSize.Width;
             Height = clientSize.Height;
 
-            base.HandleResized(clientSize);
+            base.HandleResized(clientSize, reason);
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/WindowBase.cs b/src/Avalonia.Controls/WindowBase.cs
index 2b31cef8bd..ee008efb04 100644
--- a/src/Avalonia.Controls/WindowBase.cs
+++ b/src/Avalonia.Controls/WindowBase.cs
@@ -39,7 +39,6 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<bool> TopmostProperty =
             AvaloniaProperty.Register<WindowBase, bool>(nameof(Topmost));
 
-        private int _autoSizing;
         private bool _hasExecutedInitialLayoutPass;
         private bool _isActive;
         private bool _ignoreVisibilityChange;
@@ -95,10 +94,8 @@ namespace Avalonia.Controls
         
         public Screens Screens { get; private set; }
 
-        /// <summary>
-        /// Whether an auto-size operation is in progress.
-        /// </summary>
-        protected bool AutoSizing => _autoSizing > 0;
+        [Obsolete("No longer used. Always returns false.")]
+        protected bool AutoSizing => false;
 
         /// <summary>
         /// Gets or sets the owner of the window.
@@ -162,7 +159,7 @@ namespace Avalonia.Controls
                     LayoutManager.ExecuteInitialLayoutPass();
                     _hasExecutedInitialLayoutPass = true;
                 }
-                PlatformImpl?.Show(true);
+                PlatformImpl?.Show(true, false);
                 Renderer?.Start();
                 OnOpened(EventArgs.Empty);
             }
@@ -172,20 +169,9 @@ namespace Avalonia.Controls
             }
         }
 
-        /// <summary>
-        /// Begins an auto-resize operation.
-        /// </summary>
-        /// <returns>A disposable used to finish the operation.</returns>
-        /// <remarks>
-        /// When an auto-resize operation is in progress any resize events received will not be
-        /// cause the new size to be written to the <see cref="Layoutable.Width"/> and
-        /// <see cref="Layoutable.Height"/> properties.
-        /// </remarks>
-        protected IDisposable BeginAutoSizing()
-        {
-            ++_autoSizing;
-            return Disposable.Create(() => --_autoSizing);
-        }
+
+        [Obsolete("No longer used. Has no effect.")]
+        protected IDisposable BeginAutoSizing() => Disposable.Empty;
 
         /// <summary>
         /// Ensures that the window is initialized.
@@ -215,11 +201,15 @@ namespace Avalonia.Controls
             }
         }
 
+        [Obsolete("Use HandleResized(Size, PlatformResizeReason)")]
+        protected override void HandleResized(Size clientSize) => HandleResized(clientSize, PlatformResizeReason.Unspecified);
+
         /// <summary>
         /// Handles a resize notification from <see cref="ITopLevelImpl.Resized"/>.
         /// </summary>
         /// <param name="clientSize">The new client size.</param>
-        protected override void HandleResized(Size clientSize)
+        /// <param name="reason">The reason for the resize.</param>
+        protected override void HandleResized(Size clientSize, PlatformResizeReason reason)
         {
             ClientSize = clientSize;
             FrameSize = PlatformImpl.FrameSize;
@@ -264,7 +254,7 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Called durung the arrange pass to set the size of the window.
+        /// Called during the arrange pass to set the size of the window.
         /// </summary>
         /// <param name="size">The requested size of the window.</param>
         /// <returns>The actual size of the window.</returns>
diff --git a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
index 787f44887f..5cae29cafd 100644
--- a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
+++ b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
@@ -20,7 +20,7 @@ namespace Avalonia.DesignerSupport.Remote
             ClientSize = new Size(1, 1);
         }
 
-        public void Show(bool activate)
+        public void Show(bool activate, bool isDialog)
         {
         }
 
@@ -58,7 +58,7 @@ namespace Avalonia.DesignerSupport.Remote
             base.OnMessage(transport, obj);
         }
         
-        public void Resize(Size clientSize)
+        public void Resize(Size clientSize, PlatformResizeReason reason)
         {
             _transport.Send(new RequestViewportResizeMessage
             {
@@ -99,10 +99,6 @@ namespace Avalonia.DesignerSupport.Remote
         {
         }
 
-        public void ShowDialog(IWindowImpl parent)
-        {
-        }
-
         public void SetSystemDecorations(SystemDecorations enabled)
         {
         }
diff --git a/src/Avalonia.DesignerSupport/Remote/Stubs.cs b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
index c8203686f9..9dcd4d8e87 100644
--- a/src/Avalonia.DesignerSupport/Remote/Stubs.cs
+++ b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
@@ -27,7 +27,7 @@ namespace Avalonia.DesignerSupport.Remote
         public IEnumerable<object> Surfaces { get; }
         public Action<RawInputEventArgs> Input { get; set; }
         public Action<Rect> Paint { get; set; }
-        public Action<Size> Resized { get; set; }
+        public Action<Size, PlatformResizeReason> Resized { get; set; }
         public Action<double> ScalingChanged { get; set; }
         public Func<bool> Closing { get; set; }
         public Action Closed { get; set; }
@@ -54,7 +54,7 @@ namespace Avalonia.DesignerSupport.Remote
                 PopupPositioner = new ManagedPopupPositioner(new ManagedPopupPositionerPopupImplHelper(parent,
                     (_, size, __) =>
                     {
-                        Resize(size);
+                        Resize(size, PlatformResizeReason.Unspecified);
                     }));
         }
 
@@ -78,7 +78,7 @@ namespace Avalonia.DesignerSupport.Remote
         {
         }
 
-        public void Show(bool activate)
+        public void Show(bool activate, bool isDialog)
         {
         }
 
@@ -98,7 +98,7 @@ namespace Avalonia.DesignerSupport.Remote
         {
         }
 
-        public void Resize(Size clientSize)
+        public void Resize(Size clientSize, PlatformResizeReason reason)
         {
         }
 
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
index 3f367165ac..d0a4ad38c5 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-
 using Avalonia.Controls;
 using Avalonia.Diagnostics.Models;
 using Avalonia.Input;
@@ -22,6 +21,7 @@ namespace Avalonia.Diagnostics.ViewModels
         private bool _shouldVisualizeMarginPadding = true;
         private bool _shouldVisualizeDirtyRects;
         private bool _showFpsOverlay;
+        private bool _freezePopups;
 
 #nullable disable
         // Remove "nullable disable" after MemberNotNull will work on our CI.
@@ -41,6 +41,12 @@ namespace Avalonia.Diagnostics.ViewModels
             Console = new ConsoleViewModel(UpdateConsoleContext);
         }
 
+        public bool FreezePopups
+        {
+            get => _freezePopups;
+            set => RaiseAndSetIfChanged(ref _freezePopups, value);
+        }
+
         public bool ShouldVisualizeMarginPadding
         {
             get => _shouldVisualizeMarginPadding;
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs
index 4cb470eeac..94707ac189 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs
@@ -1,26 +1,28 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Reactive;
 using System.Reactive.Linq;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
 using Avalonia.LogicalTree;
+using Avalonia.Media;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
     internal abstract class TreeNode : ViewModelBase, IDisposable
     {
-        private IDisposable? _classesSubscription;
+        private readonly IDisposable? _classesSubscription;
         private string _classes;
         private bool _isExpanded;
 
-        public TreeNode(IVisual visual, TreeNode? parent)
+        protected TreeNode(IVisual visual, TreeNode? parent, string? customName = null)
         {
+            _classes = string.Empty;
             Parent = parent;
-            Type = visual.GetType().Name;
+            Type = customName ?? visual.GetType().Name;
             Visual = visual;
-            _classes = string.Empty;
+            FontWeight = IsRoot ? FontWeight.Bold : FontWeight.Normal;
 
             if (visual is IControl control)
             {
@@ -52,6 +54,12 @@ namespace Avalonia.Diagnostics.ViewModels
             }
         }
 
+        private bool IsRoot => Visual is TopLevel ||
+                               Visual is ContextMenu ||
+                               Visual is IPopupHost;
+
+        public FontWeight FontWeight { get; }
+
         public abstract TreeNodeCollection Children
         {
             get;
@@ -95,20 +103,5 @@ namespace Avalonia.Diagnostics.ViewModels
             _classesSubscription?.Dispose();
             Children.Dispose();
         }
-
-        private static int IndexOf(IReadOnlyList<TreeNode> collection, TreeNode item)
-        {
-            var count = collection.Count;
-
-            for (var i = 0; i < count; ++i)
-            {
-                if (collection[i] == item)
-                {
-                    return i;
-                }
-            }
-
-            throw new AvaloniaInternalException("TreeNode was not present in parent Children collection.");
-        }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs
index 48fa636664..6a430897ba 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs
@@ -1,5 +1,10 @@
 using System;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Controls.Diagnostics;
+using Avalonia.Controls.Primitives;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
 
@@ -7,31 +12,30 @@ namespace Avalonia.Diagnostics.ViewModels
 {
     internal class VisualTreeNode : TreeNode
     {
-        public VisualTreeNode(IVisual visual, TreeNode? parent)
-            : base(visual, parent)
+        public VisualTreeNode(IVisual visual, TreeNode? parent, string? customName = null)
+            : base(visual, parent, customName)
         {
             Children = new VisualTreeNodeCollection(this, visual);
 
-            if ((Visual is IStyleable styleable))
-            {
+            if (Visual is IStyleable styleable)
                 IsInTemplate = styleable.TemplatedParent != null;
-            }
         }
 
-        public bool IsInTemplate { get; private set; }
+        public bool IsInTemplate { get; }
 
         public override TreeNodeCollection Children { get; }
 
         public static VisualTreeNode[] Create(object control)
         {
-            var visual = control as IVisual;
-            return visual != null ? new[] { new VisualTreeNode(visual, null) } : Array.Empty<VisualTreeNode>();
+            return control is IVisual visual ?
+                new[] { new VisualTreeNode(visual, null) } :
+                Array.Empty<VisualTreeNode>();
         }
 
         internal class VisualTreeNodeCollection : TreeNodeCollection
         {
             private readonly IVisual _control;
-            private IDisposable? _subscription;
+            private readonly CompositeDisposable _subscriptions = new CompositeDisposable(2);
 
             public VisualTreeNodeCollection(TreeNode owner, IVisual control)
                 : base(owner)
@@ -41,15 +45,106 @@ namespace Avalonia.Diagnostics.ViewModels
 
             public override void Dispose()
             {
-                _subscription?.Dispose();
+                _subscriptions.Dispose();
+            }
+
+            private static IObservable<PopupRoot?>? GetHostedPopupRootObservable(IVisual visual)
+            {
+                static IObservable<PopupRoot?> GetPopupHostObservable(
+                    IPopupHostProvider popupHostProvider,
+                    string? providerName = null)
+                {
+                    return Observable.FromEvent<IPopupHost?>(
+                            x => popupHostProvider.PopupHostChanged += x,
+                            x => popupHostProvider.PopupHostChanged -= x)
+                        .StartWith(popupHostProvider.PopupHost)
+                        .Select(popupHost =>
+                        {
+                            if (popupHost is IControl control)
+                                return new PopupRoot(
+                                    control,
+                                    providerName != null ? $"{providerName} ({control.GetType().Name})" : null);
+
+                            return (PopupRoot?)null;
+                        });
+                }
+
+                return visual switch
+                {
+                    Popup p => GetPopupHostObservable(p),
+                    Control c => Observable.CombineLatest(
+                            c.GetObservable(Control.ContextFlyoutProperty),
+                            c.GetObservable(Control.ContextMenuProperty),
+                            c.GetObservable(FlyoutBase.AttachedFlyoutProperty),
+                            c.GetObservable(ToolTipDiagnostics.ToolTipProperty),
+                            (ContextFlyout, ContextMenu, AttachedFlyout, ToolTip) =>
+                            {
+                                if (ContextMenu != null)
+                                    //Note: ContextMenus are special since all the items are added as visual children.
+                                    //So we don't need to go via Popup
+                                    return Observable.Return<PopupRoot?>(new PopupRoot(ContextMenu));
+
+                                if (ContextFlyout != null)
+                                    return GetPopupHostObservable(ContextFlyout, "ContextFlyout");
+
+                                if (AttachedFlyout != null)
+                                    return GetPopupHostObservable(AttachedFlyout, "AttachedFlyout");
+
+                                if (ToolTip != null)
+                                    return GetPopupHostObservable(ToolTip, "ToolTip");
+
+                                return Observable.Return<PopupRoot?>(null);
+                            })
+                        .Switch(),
+                    _ => null
+                };
             }
 
             protected override void Initialize(AvaloniaList<TreeNode> nodes)
             {
-                _subscription = _control.VisualChildren.ForEachItem(
-                    (i, item) => nodes.Insert(i, new VisualTreeNode(item, Owner)),
-                    (i, item) => nodes.RemoveAt(i),
-                    () => nodes.Clear());
+                _subscriptions.Clear();
+
+                if (GetHostedPopupRootObservable(_control) is { } popupRootObservable)
+                {
+                    VisualTreeNode? childNode = null;
+
+                    _subscriptions.Add(
+                        popupRootObservable
+                            .Subscribe(popupRoot =>
+                            {
+                                if (popupRoot != null)
+                                {
+                                    childNode = new VisualTreeNode(
+                                        popupRoot.Value.Root,
+                                        Owner,
+                                        popupRoot.Value.CustomName);
+
+                                    nodes.Add(childNode);
+                                }
+                                else if (childNode != null)
+                                {
+                                    nodes.Remove(childNode);
+                                }
+                            }));
+                }
+
+                _subscriptions.Add(
+                    _control.VisualChildren.ForEachItem(
+                        (i, item) => nodes.Insert(i, new VisualTreeNode(item, Owner)),
+                        (i, item) => nodes.RemoveAt(i),
+                        () => nodes.Clear()));
+            }
+
+            private struct PopupRoot
+            {
+                public PopupRoot(IControl root, string? customName = null)
+                {
+                    Root = root;
+                    CustomName = customName;
+                }
+
+                public IControl Root { get; }
+                public string? CustomName { get; }
             }
         }
     }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
index 8c4db33f91..6f2ac96a66 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
@@ -5,14 +5,14 @@
   <Grid Name="rootGrid" RowDefinitions="Auto,Auto,*,Auto,0,Auto">
     <Menu>
       <MenuItem Header="_File">
-        <MenuItem Header="E_xit" Command="{Binding $parent[Window].Close}"/>
+        <MenuItem Header="E_xit" Command="{Binding $parent[Window].Close}" />
       </MenuItem>
       <MenuItem Header="_View">
         <MenuItem Header="_Console" Command="{Binding $parent[UserControl].ToggleConsole}">
           <MenuItem.Icon>
             <CheckBox BorderThickness="0"
                       IsChecked="{Binding Console.IsVisible}"
-                      IsEnabled="False"/>
+                      IsEnabled="False" />
           </MenuItem.Icon>
         </MenuItem>
       </MenuItem>
@@ -21,58 +21,68 @@
           <MenuItem.Icon>
             <CheckBox BorderThickness="0"
                       IsChecked="{Binding ShouldVisualizeMarginPadding}"
-                      IsEnabled="False"/>
+                      IsEnabled="False" />
           </MenuItem.Icon>
         </MenuItem>
         <MenuItem Header="Visualize dirty rects" Command="{Binding ToggleVisualizeDirtyRects}">
           <MenuItem.Icon>
             <CheckBox BorderThickness="0"
                       IsChecked="{Binding ShouldVisualizeDirtyRects}"
-                      IsEnabled="False"/>
+                      IsEnabled="False" />
           </MenuItem.Icon>
         </MenuItem>
-         <MenuItem Header="Show fps overlay" Command="{Binding ToggleFpsOverlay}">
+        <MenuItem Header="Show fps overlay" Command="{Binding ToggleFpsOverlay}">
           <MenuItem.Icon>
             <CheckBox BorderThickness="0"
                       IsChecked="{Binding ShowFpsOverlay}"
-                      IsEnabled="False"/>
+                      IsEnabled="False" />
           </MenuItem.Icon>
         </MenuItem>
       </MenuItem>
     </Menu>
-    
+
     <TabStrip Grid.Row="1" SelectedIndex="{Binding SelectedTab, Mode=TwoWay}">
-      <TabStripItem Content="Logical Tree"/>
-      <TabStripItem Content="Visual Tree"/>
-      <TabStripItem Content="Events"/>
+      <TabStripItem Content="Logical Tree" />
+      <TabStripItem Content="Visual Tree" />
+      <TabStripItem Content="Events" />
     </TabStrip>
 
     <ContentControl Grid.Row="2"
                     BorderBrush="{DynamicResource ThemeControlMidBrush}"
                     BorderThickness="0,1,0,0"
-                    Content="{Binding Content}"/>
+                    Content="{Binding Content}" />
 
     <GridSplitter Name="consoleSplitter" Grid.Row="3" Height="1"
                   Background="{DynamicResource ThemeControlMidBrush}"
-                  IsVisible="False"/>
-    
+                  IsVisible="False" />
+
     <views:ConsoleView Name="console"
                        Grid.Row="4"
                        DataContext="{Binding Console}"
-                       IsVisible="{Binding IsVisible}"/>
+                       IsVisible="{Binding IsVisible}" />
+
 
     <Border Grid.Row="5"
             BorderBrush="{DynamicResource ThemeControlMidBrush}"
             BorderThickness="0,1,0,0">
-      <StackPanel Spacing="4" Orientation="Horizontal">
-        <TextBlock>Hold Ctrl+Shift over a control to inspect.</TextBlock>
-        <Separator Width="8"/>
-        <TextBlock>Focused:</TextBlock>
-        <TextBlock Text="{Binding FocusedControl}"/>
-        <Separator Width="8"/>
-        <TextBlock>Pointer Over:</TextBlock>
-        <TextBlock Text="{Binding PointerOverElement}"/>
-      </StackPanel>
+      <Grid ColumnDefinitions="*, Auto">
+        <StackPanel Grid.Column="0" Spacing="4" Orientation="Horizontal">
+          <TextBlock>Hold Ctrl+Shift over a control to inspect.</TextBlock>
+          <Separator Width="8" />
+          <TextBlock>Focused:</TextBlock>
+          <TextBlock Text="{Binding FocusedControl}" />
+          <Separator Width="8" />
+          <TextBlock>Pointer Over:</TextBlock>
+          <TextBlock Text="{Binding PointerOverElement}" />
+        </StackPanel>
+
+        <TextBlock Grid.Column="1"
+                   Foreground="Gray"
+                   Margin="2 0"
+                   Text="Popups frozen"
+                   IsVisible="{Binding FreezePopups}" />
+      </Grid>
+
     </Border>
   </Grid>
 </UserControl>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
index d1232b749a..ea06c33e4d 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
@@ -1,8 +1,11 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
 using Avalonia.Controls;
+using Avalonia.Controls.Diagnostics;
 using Avalonia.Controls.Primitives;
+using Avalonia.Data;
 using Avalonia.Diagnostics.ViewModels;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
@@ -15,6 +18,7 @@ namespace Avalonia.Diagnostics.Views
     internal class MainWindow : Window, IStyleHost
     {
         private readonly IDisposable _keySubscription;
+        private readonly Dictionary<Popup, IDisposable> _frozenPopupStates;
         private TopLevel? _root;
 
         public MainWindow()
@@ -23,23 +27,26 @@ namespace Avalonia.Diagnostics.Views
 
             _keySubscription = InputManager.Instance.Process
                 .OfType<RawKeyEventArgs>()
+                .Where(x => x.Type == RawKeyEventType.KeyDown)
                 .Subscribe(RawKeyDown);
 
+            _frozenPopupStates = new Dictionary<Popup, IDisposable>();
+
             EventHandler? lh = default;
             lh = (s, e) =>
-              {
-                  this.Opened -= lh;
-                  if ((DataContext as MainViewModel)?.StartupScreenIndex is int index)
-                  {
-                      var screens = this.Screens;
-                      if (index > -1 && index < screens.ScreenCount)                          
-                      {
-                          var screen = screens.All[index];
-                          this.Position = screen.Bounds.TopLeft;
-                          this.WindowState = WindowState.Maximized;
-                      }
-                  }
-              };
+            {
+                this.Opened -= lh;
+                if ((DataContext as MainViewModel)?.StartupScreenIndex is { } index)
+                {
+                    var screens = this.Screens;
+                    if (index > -1 && index < screens.ScreenCount)
+                    {
+                        var screen = screens.All[index];
+                        this.Position = screen.Bounds.TopLeft;
+                        this.WindowState = WindowState.Maximized;
+                    }
+                }
+            };
             this.Opened += lh;
         }
 
@@ -77,6 +84,13 @@ namespace Avalonia.Diagnostics.Views
             base.OnClosed(e);
             _keySubscription.Dispose();
 
+            foreach (var state in _frozenPopupStates)
+            {
+                state.Value.Dispose();
+            }
+
+            _frozenPopupStates.Clear();
+
             if (_root != null)
             {
                 _root.Closed -= RootClosed;
@@ -91,6 +105,53 @@ namespace Avalonia.Diagnostics.Views
             AvaloniaXamlLoader.Load(this);
         }
 
+        private IControl? GetHoveredControl(TopLevel topLevel)
+        {
+#pragma warning disable CS0618 // Type or member is obsolete
+            var point = (topLevel as IInputRoot)?.MouseDevice?.GetPosition(topLevel) ?? default;
+#pragma warning restore CS0618 // Type or member is obsolete                
+
+            return (IControl?)topLevel.GetVisualsAt(point, x =>
+                {
+                    if (x is AdornerLayer || !x.IsVisible)
+                    {
+                        return false;
+                    }
+
+                    return !(x is IInputElement ie) || ie.IsHitTestVisible;
+                })
+                .FirstOrDefault();
+        }
+
+        private static List<PopupRoot> GetPopupRoots(IVisual root)
+        {
+            var popupRoots = new List<PopupRoot>();
+
+            void ProcessProperty<T>(IControl control, AvaloniaProperty<T> property)
+            {
+                if (control.GetValue(property) is IPopupHostProvider popupProvider
+                    && popupProvider.PopupHost is PopupRoot popupRoot)
+                {
+                    popupRoots.Add(popupRoot);
+                }
+            }
+
+            foreach (var control in root.GetVisualDescendants().OfType<IControl>())
+            {
+                if (control is Popup p && p.Host is PopupRoot popupRoot)
+                {
+                    popupRoots.Add(popupRoot);
+                }
+
+                ProcessProperty(control, ContextFlyoutProperty);
+                ProcessProperty(control, ContextMenuProperty);
+                ProcessProperty(control, FlyoutBase.AttachedFlyoutProperty);
+                ProcessProperty(control, ToolTipDiagnostics.ToolTipProperty);
+            }
+
+            return popupRoots;
+        }
+
         private void RawKeyDown(RawKeyEventArgs e)
         {
             var vm = (MainViewModel?)DataContext;
@@ -99,34 +160,72 @@ namespace Avalonia.Diagnostics.Views
                 return;
             }
 
-            const RawInputModifiers modifiers = RawInputModifiers.Control | RawInputModifiers.Shift;
-
-            if (e.Modifiers == modifiers)
+            switch (e.Modifiers)
             {
-#pragma warning disable CS0618 // Type or member is obsolete
-                var point = (Root as IInputRoot)?.MouseDevice?.GetPosition(Root) ?? default;
-#pragma warning restore CS0618 // Type or member is obsolete                
+                case RawInputModifiers.Control | RawInputModifiers.Shift:
+                {
+                    IControl? control = null;
+
+                    foreach (var popupRoot in GetPopupRoots(Root))
+                    {
+                        control = GetHoveredControl(popupRoot);
+
+                        if (control != null)
+                        {
+                            break;
+                        }
+                    }
+
+                    control ??= GetHoveredControl(Root);
 
-                var control = Root.GetVisualsAt(point, x =>
+                    if (control != null)
                     {
-                        if (x is AdornerLayer || !x.IsVisible) return false;
-                        if (!(x is IInputElement ie)) return true;
-                        return ie.IsHitTestVisible;
-                    })
-                    .FirstOrDefault();
+                        vm.SelectControl(control);
+                    }
+
+                    break;
+                }
 
-                if (control != null)
+                case RawInputModifiers.Control | RawInputModifiers.Alt when e.Key == Key.F:
                 {
-                    vm.SelectControl((IControl)control);
+                    vm.FreezePopups = !vm.FreezePopups;
+
+                    foreach (var popupRoot in GetPopupRoots(Root))
+                    {
+                        if (popupRoot.Parent is Popup popup)
+                        {
+                            if (vm.FreezePopups)
+                            {
+                                var lightDismissEnabledState = popup.SetValue(
+                                    Popup.IsLightDismissEnabledProperty,
+                                    !vm.FreezePopups,
+                                    BindingPriority.Animation);
+
+                                if (lightDismissEnabledState != null)
+                                {
+                                    _frozenPopupStates[popup] = lightDismissEnabledState;
+                                }
+                            }
+                            else
+                            {
+                                //TODO Use Dictionary.Remove(Key, out Value) in netstandard 2.1
+                                if (_frozenPopupStates.ContainsKey(popup))
+                                {
+                                    _frozenPopupStates[popup].Dispose();
+                                    _frozenPopupStates.Remove(popup);
+                                }
+                            }
+                        }
+                    }
+
+                    break;
                 }
-            } 
-            else if (e.Modifiers == RawInputModifiers.Alt)
-            {
-                if (e.Key == Key.S || e.Key == Key.D)
+
+                case RawInputModifiers.Alt when e.Key == Key.S || e.Key == Key.D:
                 {
-                    var enable = e.Key == Key.S;
+                    vm.EnableSnapshotStyles(e.Key == Key.S);
 
-                    vm.EnableSnapshotStyles(enable);
+                    break;
                 }
             }
         }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml
index a5328716fc..bb661f7f4c 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml
@@ -11,7 +11,7 @@
         <TreeDataTemplate DataType="vm:TreeNode"
                           ItemsSource="{Binding Children}">
           <StackPanel Orientation="Horizontal" Spacing="8">
-            <TextBlock Text="{Binding Type}"/>
+            <TextBlock Text="{Binding Type}" FontWeight="{Binding FontWeight}"/>
             <TextBlock Text="{Binding Classes}"/>
             <TextBlock Foreground="Gray" Text="{Binding ElementName}"/>
           </StackPanel>
diff --git a/src/Avalonia.Headless/HeadlessWindowImpl.cs b/src/Avalonia.Headless/HeadlessWindowImpl.cs
index 7f4b9face4..31315848d1 100644
--- a/src/Avalonia.Headless/HeadlessWindowImpl.cs
+++ b/src/Avalonia.Headless/HeadlessWindowImpl.cs
@@ -47,7 +47,7 @@ namespace Avalonia.Headless
         public IEnumerable<object> Surfaces { get; }
         public Action<RawInputEventArgs> Input { get; set; }
         public Action<Rect> Paint { get; set; }
-        public Action<Size> Resized { get; set; }
+        public Action<Size, PlatformResizeReason> Resized { get; set; }
         public Action<double> ScalingChanged { get; set; }
 
         public IRenderer CreateRenderer(IRenderRoot root)
@@ -76,7 +76,7 @@ namespace Avalonia.Headless
         public Action Closed { get; set; }
         public IMouseDevice MouseDevice { get; }
 
-        public void Show(bool activate)
+        public void Show(bool activate, bool isDialog)
         {
             if (activate)
                 Dispatcher.UIThread.Post(() => Activated?.Invoke(), DispatcherPriority.Input);
@@ -108,7 +108,7 @@ namespace Avalonia.Headless
         public Action Activated { get; set; }
         public IPlatformHandle Handle { get; } = new PlatformHandle(IntPtr.Zero, "STUB");
         public Size MaxClientSize { get; } = new Size(1920, 1280);
-        public void Resize(Size clientSize)
+        public void Resize(Size clientSize, PlatformResizeReason reason)
         {
             // Emulate X11 behavior here
             if (IsPopup)
@@ -126,7 +126,7 @@ namespace Avalonia.Headless
             if (ClientSize != clientSize)
             {
                 ClientSize = clientSize;
-                Resized?.Invoke(clientSize);
+                Resized?.Invoke(clientSize, PlatformResizeReason.Unspecified);
             }
         }
 
@@ -148,11 +148,6 @@ namespace Avalonia.Headless
 
         }
 
-        public void ShowDialog(IWindowImpl parent)
-        {
-            Show(true);
-        }
-
         public void SetSystemDecorations(bool enabled)
         {
 
diff --git a/src/Avalonia.Input/Avalonia.Input.csproj b/src/Avalonia.Input/Avalonia.Input.csproj
index c39c81a965..69a80290d1 100644
--- a/src/Avalonia.Input/Avalonia.Input.csproj
+++ b/src/Avalonia.Input/Avalonia.Input.csproj
@@ -4,6 +4,9 @@
     <Nullable>Enable</Nullable>
     <WarningsAsErrors>CS8600;CS8602;CS8603</WarningsAsErrors>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
diff --git a/src/Avalonia.Input/Cursor.cs b/src/Avalonia.Input/Cursor.cs
index 2b99c51472..122838f682 100644
--- a/src/Avalonia.Input/Cursor.cs
+++ b/src/Avalonia.Input/Cursor.cs
@@ -37,7 +37,7 @@ namespace Avalonia.Input
         BottomSize = BottomSide
 
         // Not available in GTK directly, see http://www.pixelbeat.org/programming/x_cursors/ 
-        // We might enable them later, preferably, by loading pixmax direclty from theme with fallback image
+        // We might enable them later, preferably, by loading pixmax directly from theme with fallback image
         // SizeNorthWestSouthEast,
         // SizeNorthEastSouthWest,
     }
diff --git a/src/Avalonia.Input/FocusManager.cs b/src/Avalonia.Input/FocusManager.cs
index 474b212a21..1432092ba1 100644
--- a/src/Avalonia.Input/FocusManager.cs
+++ b/src/Avalonia.Input/FocusManager.cs
@@ -92,6 +92,17 @@ namespace Avalonia.Input
             }
         }
 
+        public IInputElement? GetFocusedElement(IInputElement e)
+        {
+            if (e is IFocusScope scope)
+            {
+                _focusScopes.TryGetValue(scope, out var result);
+                return result;
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Sets the currently focused element in the specified scope.
         /// </summary>
@@ -151,6 +162,8 @@ namespace Avalonia.Input
             Focus(e);
         }
 
+        public static bool GetIsFocusScope(IInputElement e) => e is IFocusScope;
+
         /// <summary>
         /// Checks if the specified element can be focused.
         /// </summary>
diff --git a/src/Avalonia.Input/GestureRecognizers/ScrollGestureRecognizer.cs b/src/Avalonia.Input/GestureRecognizers/ScrollGestureRecognizer.cs
index 3858cc04f2..84a26a0cc3 100644
--- a/src/Avalonia.Input/GestureRecognizers/ScrollGestureRecognizer.cs
+++ b/src/Avalonia.Input/GestureRecognizers/ScrollGestureRecognizer.cs
@@ -78,7 +78,7 @@ namespace Avalonia.Input.GestureRecognizers
         // Arbitrary chosen value, probably need to move that to platform settings or something
         private const double ScrollStartDistance = 30;
         
-        // Pixels per second speed that is considered to be the stop of inertiall scroll
+        // Pixels per second speed that is considered to be the stop of inertial scroll
         private const double InertialScrollSpeedEnd = 5;
         
         public void PointerMoved(PointerEventArgs e)
diff --git a/src/Avalonia.Input/ICommandSource.cs b/src/Avalonia.Input/ICommandSource.cs
index ba2e8eed4e..eed71759d5 100644
--- a/src/Avalonia.Input/ICommandSource.cs
+++ b/src/Avalonia.Input/ICommandSource.cs
@@ -22,7 +22,7 @@ namespace Avalonia.Input
 
 
         /// <summary>
-        /// Bor the bheavior CanExecuteChanged
+        /// Bor the behavior CanExecuteChanged
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
diff --git a/src/Avalonia.Input/ICustomKeyboardNavigation.cs b/src/Avalonia.Input/ICustomKeyboardNavigation.cs
index 3d2927c632..357395c42f 100644
--- a/src/Avalonia.Input/ICustomKeyboardNavigation.cs
+++ b/src/Avalonia.Input/ICustomKeyboardNavigation.cs
@@ -1,4 +1,5 @@
-
+#nullable enable
+
 namespace Avalonia.Input
 {
     /// <summary>
@@ -6,6 +7,18 @@ namespace Avalonia.Input
     /// </summary>
     public interface ICustomKeyboardNavigation
     {
-        (bool handled, IInputElement next) GetNext(IInputElement element, NavigationDirection direction);
+        /// <summary>
+        /// Gets the next element in the specified navigation direction.
+        /// </summary>
+        /// <param name="element">The element being navigated from.</param>
+        /// <param name="direction">The navigation direction.</param>
+        /// <returns>
+        /// A tuple consisting of:
+        /// - A boolean indicating whether the request was handled. If false is returned then 
+        ///   custom navigation will be ignored and default navigation will take place.
+        /// - If handled is true: the next element in the navigation direction, or null if default
+        ///   navigation should continue outside the element.
+        /// </returns>
+        (bool handled, IInputElement? next) GetNext(IInputElement element, NavigationDirection direction);
     }
 }
diff --git a/src/Avalonia.Input/InputElement.cs b/src/Avalonia.Input/InputElement.cs
index 65b9acae76..63080e74e4 100644
--- a/src/Avalonia.Input/InputElement.cs
+++ b/src/Avalonia.Input/InputElement.cs
@@ -71,6 +71,12 @@ namespace Avalonia.Input
         public static readonly DirectProperty<InputElement, bool> IsPointerOverProperty =
             AvaloniaProperty.RegisterDirect<InputElement, bool>(nameof(IsPointerOver), o => o.IsPointerOver);
 
+        /// <summary>
+        /// Defines the <see cref="IsTabStop"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsTabStopProperty =
+            KeyboardNavigation.IsTabStopProperty.AddOwner<InputElement>();
+
         /// <summary>
         /// Defines the <see cref="GotFocus"/> event.
         /// </summary>
@@ -99,6 +105,12 @@ namespace Avalonia.Input
                 "KeyUp",
                 RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
 
+        /// <summary>
+        /// Defines the <see cref="TabIndex"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> TabIndexProperty =
+            KeyboardNavigation.TabIndexProperty.AddOwner<InputElement>();
+
         /// <summary>
         /// Defines the <see cref="TextInput"/> event.
         /// </summary>
@@ -426,6 +438,15 @@ namespace Avalonia.Input
             internal set { SetAndRaise(IsPointerOverProperty, ref _isPointerOver, value); }
         }
 
+        /// <summary>
+        /// Gets or sets a value that indicates whether the control is included in tab navigation.
+        /// </summary>
+        public bool IsTabStop
+        {
+            get => GetValue(IsTabStopProperty);
+            set => SetValue(IsTabStopProperty, value);
+        }
+
         /// <inheritdoc/>
         public bool IsEffectivelyEnabled
         {
@@ -437,6 +458,16 @@ namespace Avalonia.Input
             }
         }
 
+        /// <summary>
+        /// Gets or sets a value that determines the order in which elements receive focus when the
+        /// user navigates through controls by pressing the Tab key.
+        /// </summary>
+        public int TabIndex
+        {
+            get => GetValue(TabIndexProperty);
+            set => SetValue(TabIndexProperty, value);
+        }
+
         public List<KeyBinding> KeyBindings { get; } = new List<KeyBinding>();
 
         /// <summary>
diff --git a/src/Avalonia.Input/KeyboardNavigation.cs b/src/Avalonia.Input/KeyboardNavigation.cs
index 6ef3c4fd60..a25aed6811 100644
--- a/src/Avalonia.Input/KeyboardNavigation.cs
+++ b/src/Avalonia.Input/KeyboardNavigation.cs
@@ -5,6 +5,15 @@ namespace Avalonia.Input
     /// </summary>
     public static class KeyboardNavigation
     {
+        /// <summary>
+        /// Defines the TabIndex attached property.
+        /// </summary>
+        public static readonly AttachedProperty<int> TabIndexProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, int>(
+                "TabIndex",
+                typeof(KeyboardNavigation),
+                int.MaxValue);
+
         /// <summary>
         /// Defines the TabNavigation attached property.
         /// </summary>
@@ -42,6 +51,26 @@ namespace Avalonia.Input
                 typeof(KeyboardNavigation), 
                 true);
 
+        /// <summary>
+        /// Gets the <see cref="TabIndexProperty"/> for an element.
+        /// </summary>
+        /// <param name="element">The container.</param>
+        /// <returns>The <see cref="KeyboardNavigationMode"/> for the container.</returns>
+        public static int GetTabIndex(IInputElement element)
+        {
+            return ((IAvaloniaObject)element).GetValue(TabIndexProperty);
+        }
+
+        /// <summary>
+        /// Sets the <see cref="TabIndexProperty"/> for an element.
+        /// </summary>
+        /// <param name="element">The element.</param>
+        /// <param name="value">The tab index.</param>
+        public static void SetTabIndex(IInputElement element, int value)
+        {
+            ((IAvaloniaObject)element).SetValue(TabIndexProperty, value);
+        }
+
         /// <summary>
         /// Gets the <see cref="TabNavigationProperty"/> for a container.
         /// </summary>
@@ -83,7 +112,7 @@ namespace Avalonia.Input
         }
 
         /// <summary>
-        /// Sets the <see cref="IsTabStopProperty"/> for a container.
+        /// Sets the <see cref="IsTabStopProperty"/> for an element.
         /// </summary>
         /// <param name="element">The container.</param>
         /// <param name="value">Value indicating whether the container is a tab stop.</param>
@@ -93,7 +122,7 @@ namespace Avalonia.Input
         }
 
         /// <summary>
-        /// Gets the <see cref="IsTabStopProperty"/> for a container.
+        /// Gets the <see cref="IsTabStopProperty"/> for an element.
         /// </summary>
         /// <param name="element">The container.</param>
         /// <returns>Whether the container is a tab stop.</returns>
diff --git a/src/Avalonia.Input/KeyboardNavigationHandler.cs b/src/Avalonia.Input/KeyboardNavigationHandler.cs
index dbefe63789..6493777105 100644
--- a/src/Avalonia.Input/KeyboardNavigationHandler.cs
+++ b/src/Avalonia.Input/KeyboardNavigationHandler.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Avalonia.Input.Navigation;
 using Avalonia.VisualTree;
@@ -48,39 +49,24 @@ namespace Avalonia.Input
         {
             element = element ?? throw new ArgumentNullException(nameof(element));
 
-            var customHandler = element.GetSelfAndVisualAncestors()
-                .OfType<ICustomKeyboardNavigation>()
-                .FirstOrDefault();
+            // If there's a custom keyboard navigation handler as an ancestor, use that.
+            var custom = element.FindAncestorOfType<ICustomKeyboardNavigation>(true);
+            if (custom is object && HandlePreCustomNavigation(custom, element, direction, out var ce))
+                return ce;
 
-            if (customHandler != null)
+            var result = direction switch
             {
-                var (handled, next) = customHandler.GetNext(element, direction);
+                NavigationDirection.Next => TabNavigation.GetNextTab(element, false),
+                NavigationDirection.Previous => TabNavigation.GetPrevTab(element, null, false),
+                _ => throw new NotSupportedException(),
+            };
 
-                if (handled)
-                {
-                    if (next != null)
-                    {
-                        return next;
-                    }
-                    else if (direction == NavigationDirection.Next || direction == NavigationDirection.Previous)
-                    {
-                        return TabNavigation.GetNextInTabOrder((IInputElement)customHandler, direction, true);
-                    }
-                    else
-                    {
-                        return null;
-                    }
-                }
-            }
+            // If there wasn't a custom navigation handler as an ancestor of the current element,
+            // but there is one as an ancestor of the new element, use that.
+            if (custom is null && HandlePostCustomNavigation(element, result, direction, out ce))
+                return ce;
 
-            if (direction == NavigationDirection.Next || direction == NavigationDirection.Previous)
-            {
-                return TabNavigation.GetNextInTabOrder(element, direction);
-            }
-            else
-            {
-                throw new NotSupportedException();
-            }
+            return result;
         }
 
         /// <summary>
@@ -90,7 +76,7 @@ namespace Avalonia.Input
         /// <param name="direction">The direction to move.</param>
         /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
         public void Move(
-            IInputElement element, 
+            IInputElement element,
             NavigationDirection direction,
             KeyModifiers keyModifiers = KeyModifiers.None)
         {
@@ -124,5 +110,70 @@ namespace Avalonia.Input
                 e.Handled = true;
             }
         }
+
+        private static bool HandlePreCustomNavigation(
+            ICustomKeyboardNavigation customHandler,
+            IInputElement element,
+            NavigationDirection direction,
+            [NotNullWhen(true)] out IInputElement? result)
+        {
+            if (customHandler != null)
+            {
+                var (handled, next) = customHandler.GetNext(element, direction);
+
+                if (handled)
+                {
+                    if (next != null)
+                    {
+                        result = next;
+                        return true;
+                    }
+                    else if (direction == NavigationDirection.Next || direction == NavigationDirection.Previous)
+                    {
+                        var r = direction switch
+                        {
+                            NavigationDirection.Next => TabNavigation.GetNextTabOutside(customHandler),
+                            NavigationDirection.Previous => TabNavigation.GetPrevTabOutside(customHandler),
+                            _ => throw new NotSupportedException(),
+                        };
+
+                        if (r is object)
+                        {
+                            result = r;
+                            return true;
+                        }
+                    }
+                }
+            }
+
+            result = null;
+            return false;
+        }
+
+        private static bool HandlePostCustomNavigation(
+            IInputElement element,
+            IInputElement? newElement,
+            NavigationDirection direction,
+            [NotNullWhen(true)] out IInputElement? result)
+        {
+            if (newElement is object)
+            {
+                var customHandler = newElement.FindAncestorOfType<ICustomKeyboardNavigation>(true);
+
+                if (customHandler is object)
+                {
+                    var (handled, next) = customHandler.GetNext(element, direction);
+
+                    if (handled && next is object)
+                    {
+                        result = next;
+                        return true;
+                    }
+                }
+            }
+
+            result = null;
+            return false;
+        }
     }
 }
diff --git a/src/Avalonia.Input/KeyboardNavigationMode.cs b/src/Avalonia.Input/KeyboardNavigationMode.cs
index 41e778bf49..e01ebf0330 100644
--- a/src/Avalonia.Input/KeyboardNavigationMode.cs
+++ b/src/Avalonia.Input/KeyboardNavigationMode.cs
@@ -36,5 +36,10 @@ namespace Avalonia.Input
         /// The container's children will not be focused when using the tab key.
         /// </summary>
         None,
+
+        /// <summary>
+        /// TabIndexes are considered on local subtree only inside this container
+        /// </summary>
+        Local,
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Input/Navigation/TabNavigation.cs b/src/Avalonia.Input/Navigation/TabNavigation.cs
index 6f6d68940b..ed7df67bf2 100644
--- a/src/Avalonia.Input/Navigation/TabNavigation.cs
+++ b/src/Avalonia.Input/Navigation/TabNavigation.cs
@@ -10,277 +10,663 @@ namespace Avalonia.Input.Navigation
     /// </summary>
     internal static class TabNavigation
     {
-        /// <summary>
-        /// Gets the next control in the specified tab direction.
-        /// </summary>
-        /// <param name="element">The element.</param>
-        /// <param name="direction">The tab direction. Must be Next or Previous.</param>
-        /// <param name="outsideElement">
-        /// If true will not descend into <paramref name="element"/> to find next control.
-        /// </param>
-        /// <returns>
-        /// The next element in the specified direction, or null if <paramref name="element"/>
-        /// was the last in the requested direction.
-        /// </returns>
-        public static IInputElement? GetNextInTabOrder(
-            IInputElement element,
-            NavigationDirection direction,
-            bool outsideElement = false)
+        public static IInputElement? GetNextTab(IInputElement e, bool goDownOnly)
         {
-            element = element ?? throw new ArgumentNullException(nameof(element));
-
-            if (direction != NavigationDirection.Next && direction != NavigationDirection.Previous)
-            {
-                throw new ArgumentException("Invalid direction: must be Next or Previous.");
-            }
+            return GetNextTab(e, GetGroupParent(e), goDownOnly);
+        }
 
-            var container = element.GetVisualParent<IInputElement>();
+        public static IInputElement? GetNextTab(IInputElement? e, IInputElement container, bool goDownOnly)
+        {
+            var tabbingType = GetKeyNavigationMode(container);
 
-            if (container != null)
+            if (e == null)
             {
-                var mode = KeyboardNavigation.GetTabNavigation((InputElement)container);
+                if (IsTabStop(container))
+                    return container;
 
-                switch (mode)
+                // Using ActiveElement if set
+                var activeElement = GetActiveElement(container);
+                if (activeElement != null)
+                    return GetNextTab(null, activeElement, true);
+            }
+            else
+            {
+                if (tabbingType == KeyboardNavigationMode.Once || tabbingType == KeyboardNavigationMode.None)
                 {
-                    case KeyboardNavigationMode.Continue:
-                        return GetNextInContainer(element, container, direction, outsideElement) ??
-                               GetFirstInNextContainer(element, element, direction);
-                    case KeyboardNavigationMode.Cycle:
-                        return GetNextInContainer(element, container, direction, outsideElement) ??
-                               GetFocusableDescendant(container, direction);
-                    case KeyboardNavigationMode.Contained:
-                        return GetNextInContainer(element, container, direction, outsideElement);
-                    default:
-                        return GetFirstInNextContainer(element, container, direction);
+                    if (container != e)
+                    {
+                        if (goDownOnly)
+                            return null;
+                        var parentContainer = GetGroupParent(container);
+                        return GetNextTab(container, parentContainer, goDownOnly);
+                    }
                 }
             }
-            else
+
+            // All groups
+            IInputElement? loopStartElement = null;
+            var nextTabElement = e;
+            var currentTabbingType = tabbingType;
+
+            // Search down inside the container
+            while ((nextTabElement = GetNextTabInGroup(nextTabElement, container, currentTabbingType)) != null)
             {
-                return GetFocusableDescendants(element, direction).FirstOrDefault();
+                // Avoid the endless loop here for Cycle groups
+                if (loopStartElement == nextTabElement)
+                    break;
+                if (loopStartElement == null)
+                    loopStartElement = nextTabElement;
+
+                var firstTabElementInside = GetNextTab(null, nextTabElement, true);
+                if (firstTabElementInside != null)
+                    return firstTabElementInside;
+
+                // If we want to continue searching inside the Once groups, we should change the navigation mode
+                if (currentTabbingType == KeyboardNavigationMode.Once)
+                    currentTabbingType = KeyboardNavigationMode.Contained;
             }
+
+            // If there is no next element in the group (nextTabElement == null)
+
+            // Search up in the tree if allowed
+            // consider: Use original tabbingType instead of currentTabbingType
+            if (!goDownOnly && currentTabbingType != KeyboardNavigationMode.Contained && GetParent(container) != null)
+            {
+                return GetNextTab(container, GetGroupParent(container), false);
+            }
+
+            return null;
         }
 
-        /// <summary>
-        /// Gets the first or last focusable descendant of the specified element.
-        /// </summary>
-        /// <param name="container">The element.</param>
-        /// <param name="direction">The direction to search.</param>
-        /// <returns>The element or null if not found.##</returns>
-        private static IInputElement GetFocusableDescendant(IInputElement container, NavigationDirection direction)
+        public static IInputElement? GetNextTabOutside(ICustomKeyboardNavigation e)
         {
-            return direction == NavigationDirection.Next ?
-                GetFocusableDescendants(container, direction).FirstOrDefault() :
-                GetFocusableDescendants(container, direction).LastOrDefault();
+            if (e is IInputElement container)
+            {
+                var last = GetLastInTree(container);
+
+                if (last is object)
+                    return GetNextTab(last, false);
+            }
+
+            return null;
         }
 
-        /// <summary>
-        /// Gets the focusable descendants of the specified element.
-        /// </summary>
-        /// <param name="element">The element.</param>
-        /// <param name="direction">The tab direction. Must be Next or Previous.</param>
-        /// <returns>The element's focusable descendants.</returns>
-        private static IEnumerable<IInputElement> GetFocusableDescendants(IInputElement element,
-            NavigationDirection direction)
+        public static IInputElement? GetPrevTab(IInputElement? e, IInputElement? container, bool goDownOnly)
         {
-            var mode = KeyboardNavigation.GetTabNavigation((InputElement)element);
+            if (e is null && container is null)
+                throw new InvalidOperationException("Either 'e' or 'container' must be non-null.");
 
-            if (mode == KeyboardNavigationMode.None)
-            {
-                yield break;
-            }
+            if (container is null)
+                container = GetGroupParent(e!);
 
-            var children = element.GetVisualChildren().OfType<IInputElement>();
+            KeyboardNavigationMode tabbingType = GetKeyNavigationMode(container);
 
-            if (mode == KeyboardNavigationMode.Once)
+            if (e == null)
             {
-                var active = KeyboardNavigation.GetTabOnceActiveElement((InputElement)element);
-
-                if (active != null)
+                // Using ActiveElement if set
+                var activeElement = GetActiveElement(container);
+                if (activeElement != null)
+                    return GetPrevTab(null, activeElement, true);
+                else
                 {
-                    yield return active;
-                    yield break;
+                    // If we Shift+Tab on a container with KeyboardNavigationMode=Once, and ActiveElement is null
+                    // then we want to go to the first item (not last) within the container
+                    if (tabbingType == KeyboardNavigationMode.Once)
+                    {
+                        var firstTabElement = GetNextTabInGroup(null, container, tabbingType);
+                        if (firstTabElement == null)
+                        {
+                            if (IsTabStop(container))
+                                return container;
+                            if (goDownOnly)
+                                return null;
+
+                            return GetPrevTab(container, null, false);
+                        }
+                        else
+                        {
+                            return GetPrevTab(null, firstTabElement, true);
+                        }
+                    }
                 }
-                else
+            }
+            else
+            {
+                if (tabbingType == KeyboardNavigationMode.Once || tabbingType == KeyboardNavigationMode.None)
                 {
-                    children = children.Take(1);
+                    if (goDownOnly || container == e)
+                        return null;
+
+                    // FocusedElement should not be e otherwise we will delegate focus to the same element
+                    if (IsTabStop(container))
+                        return container;
+
+                    return GetPrevTab(container, null, false);
                 }
             }
 
-            foreach (var child in children)
+            // All groups (except Once) - continue
+            IInputElement? loopStartElement = null;
+            IInputElement? nextTabElement = e;
+
+            // Look for element with the same TabIndex before the current element
+            while ((nextTabElement = GetPrevTabInGroup(nextTabElement, container, tabbingType)) != null)
             {
-                var customNext = GetCustomNext(child, direction);
+                if (nextTabElement == container && tabbingType == KeyboardNavigationMode.Local)
+                    break;
+
+                // At this point nextTabElement is TabStop or TabGroup
+                // In case it is a TabStop only return the element
+                if (IsTabStop(nextTabElement) && !IsGroup(nextTabElement))
+                    return nextTabElement;
+
+                // Avoid the endless loop here
+                if (loopStartElement == nextTabElement)
+                    break;
+                if (loopStartElement == null)
+                    loopStartElement = nextTabElement;
+
+                // At this point nextTabElement is TabGroup
+                var lastTabElementInside = GetPrevTab(null, nextTabElement, true);
+                if (lastTabElementInside != null)
+                    return lastTabElementInside;
+            }
 
-                if (customNext.handled)
-                {
-                    yield return customNext.next!;
-                }
-                else
+            if (tabbingType == KeyboardNavigationMode.Contained)
+                return null;
+
+            if (e != container && IsTabStop(container))
+                return container;
+
+            // If end of the subtree is reached or there no other elements above
+            if (!goDownOnly && GetParent(container) != null)
+            {
+                return GetPrevTab(container, null, false);
+            }
+
+            return null;
+        }
+
+        public static IInputElement? GetPrevTabOutside(ICustomKeyboardNavigation e)
+        {
+            if (e is IInputElement container)
+            {
+                var first = GetFirstChild(container);
+
+                if (first is object)
+                    return GetPrevTab(first, null, false);
+            }
+
+            return null;
+        }
+
+        private static IInputElement? FocusedElement(IInputElement e)
+        {
+            var iie = e;
+            // Focus delegation is enabled only if keyboard focus is outside the container
+            if (iie != null && !iie.IsKeyboardFocusWithin)
+            {
+                var focusedElement = (FocusManager.Instance as FocusManager)?.GetFocusedElement(e);
+                if (focusedElement != null)
                 {
-                    if (child.CanFocus() && KeyboardNavigation.GetIsTabStop((InputElement)child))
+                    if (!IsFocusScope(e))
                     {
-                        yield return child;
+                        // Verify if focusedElement is a visual descendant of e
+                        if (focusedElement is IVisual visualFocusedElement &&
+                            visualFocusedElement != e &&
+                            e.IsVisualAncestorOf(visualFocusedElement))
+                        {
+                            return focusedElement;
+                        }
                     }
+                }
+            }
+
+            return null;
+        }
+
+        private static IInputElement? GetFirstChild(IInputElement e)
+        {
+            // If the element has a FocusedElement it should be its first child
+            if (FocusedElement(e) is IInputElement focusedElement)
+                return focusedElement;
 
-                    if (child.CanFocusDescendants())
+            // Return the first visible element.
+            var uiElement = e as InputElement;
+
+            if (uiElement is null || uiElement.IsVisible)
+            {
+                if (e is IVisual elementAsVisual)
+                {
+                    var children = elementAsVisual.VisualChildren;
+                    var count = children.Count;
+
+                    for (int i = 0; i < count; i++)
                     {
-                        foreach (var descendant in GetFocusableDescendants(child, direction))
+                        if (children[i] is InputElement ie)
                         {
-                            if (KeyboardNavigation.GetIsTabStop((InputElement)descendant))
+                            if (ie.IsVisible)
+                                return ie;
+                            else
                             {
-                                yield return descendant;
+                                var firstChild = GetFirstChild(ie);
+                                if (firstChild != null)
+                                    return firstChild;
                             }
                         }
                     }
                 }
             }
+
+            return null;
         }
 
-        /// <summary>
-        /// Gets the next item that should be focused in the specified container.
-        /// </summary>
-        /// <param name="element">The starting element/</param>
-        /// <param name="container">The container.</param>
-        /// <param name="direction">The direction.</param>
-        /// <param name="outsideElement">
-        /// If true will not descend into <paramref name="element"/> to find next control.
-        /// </param>
-        /// <returns>The next element, or null if the element is the last.</returns>
-        private static IInputElement? GetNextInContainer(
-            IInputElement element,
-            IInputElement container,
-            NavigationDirection direction,
-            bool outsideElement)
+        private static IInputElement? GetLastChild(IInputElement e)
         {
-            IInputElement? e = element;
+            // If the element has a FocusedElement it should be its last child
+            if (FocusedElement(e) is IInputElement focusedElement)
+                return focusedElement;
 
-            if (direction == NavigationDirection.Next && !outsideElement)
-            {
-                var descendant = GetFocusableDescendants(element, direction).FirstOrDefault();
+            // Return the last visible element.
+            var uiElement = e as InputElement;
 
-                if (descendant != null)
-                {
-                    return descendant;
-                }
-            }
-
-            if (container != null)
+            if (uiElement == null || uiElement.IsVisible)
             {
-                var navigable = container as INavigableContainer;
+                var elementAsVisual = e as IVisual;
 
-                // TODO: Do a spatial search here if the container doesn't implement
-                // INavigableContainer.
-                if (navigable != null)
+                if (elementAsVisual != null)
                 {
-                    while (e != null)
-                    {
-                        e = navigable.GetControl(direction, e, false);
+                    var children = elementAsVisual.VisualChildren;
+                    var count = children.Count;
 
-                        if (e != null && 
-                            e.CanFocus() &&
-                            KeyboardNavigation.GetIsTabStop((InputElement)e))
+                    for (int i = count - 1; i >= 0; i--)
+                    {
+                        if (children[i] is InputElement ie)
                         {
-                            break;
+                            if (ie.IsVisible)
+                                return ie;
+                            else
+                            {
+                                var lastChild = GetLastChild(ie);
+                                if (lastChild != null)
+                                    return lastChild;
+                            }
                         }
                     }
                 }
-                else
+            }
+
+            return null;
+        }
+
+        private static IInputElement? GetFirstTabInGroup(IInputElement container)
+        {
+            IInputElement? firstTabElement = null;
+            int minIndexFirstTab = int.MinValue;
+
+            var currElement = container;
+            while ((currElement = GetNextInTree(currElement, container)) != null)
+            {
+                if (IsTabStopOrGroup(currElement))
                 {
-                    // TODO: Do a spatial search here if the container doesn't implement
-                    // INavigableContainer.
-                    e = null;
+                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
+
+                    if (currPriority < minIndexFirstTab || firstTabElement == null)
+                    {
+                        minIndexFirstTab = currPriority;
+                        firstTabElement = currElement;
+                    }
                 }
+            }
+            return firstTabElement;
+        }
+
+        private static IInputElement? GetLastInTree(IInputElement container)
+        {
+            IInputElement? result;
+            IInputElement? c = container;
+
+            do
+            {
+                result = c;
+                c = GetLastChild(c);
+            } while (c != null && !IsGroup(c));
+
+            if (c != null)
+                return c;
+
+            return result;
+        }
 
-                if (e != null && direction == NavigationDirection.Previous)
+        private static IInputElement? GetLastTabInGroup(IInputElement container)
+        {
+            IInputElement? lastTabElement = null;
+            int maxIndexFirstTab = int.MaxValue;
+            var currElement = GetLastInTree(container);
+            while (currElement != null && currElement != container)
+            {
+                if (IsTabStopOrGroup(currElement))
                 {
-                    var descendant = GetFocusableDescendants(e, direction).LastOrDefault();
+                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
 
-                    if (descendant != null)
+                    if (currPriority > maxIndexFirstTab || lastTabElement == null)
                     {
-                        return descendant;
+                        maxIndexFirstTab = currPriority;
+                        lastTabElement = currElement;
                     }
                 }
+                currElement = GetPreviousInTree(currElement, container);
+            }
+            return lastTabElement;
+        }
+
+        private static IInputElement? GetNextInTree(IInputElement e, IInputElement container)
+        {
+            IInputElement? result = null;
+
+            if (e == container || !IsGroup(e))
+                result = GetFirstChild(e);
+
+            if (result != null || e == container)
+                return result;
+
+            IInputElement? parent = e;
+            do
+            {
+                var sibling = GetNextSibling(parent);
+                if (sibling != null)
+                    return sibling;
 
-                return e;
+                parent = GetParent(parent);
+            } while (parent != null && parent != container);
+
+            return null;
+        }
+
+        private static IInputElement? GetNextSibling(IInputElement e)
+        {
+            if (GetParent(e) is IVisual parentAsVisual && e is IVisual elementAsVisual)
+            {
+                var children = parentAsVisual.VisualChildren;
+                var count = children.Count;
+                var i = 0;
+
+                //go till itself
+                for (; i < count; i++)
+                {
+                    var vchild = children[i];
+                    if (vchild == elementAsVisual)
+                        break;
+                }
+                i++;
+                //search ahead
+                for (; i < count; i++)
+                {
+                    var visual = children[i];
+                    if (visual is IInputElement ie)
+                        return ie;
+                }
             }
 
             return null;
         }
 
-        /// <summary>
-        /// Gets the first item that should be focused in the next container.
-        /// </summary>
-        /// <param name="element">The element being navigated away from.</param>
-        /// <param name="container">The container.</param>
-        /// <param name="direction">The direction of the search.</param>
-        /// <returns>The first element, or null if there are no more elements.</returns>
-        private static IInputElement? GetFirstInNextContainer(
-            IInputElement element,
-            IInputElement container,
-            NavigationDirection direction)
+        private static IInputElement? GetNextTabInGroup(IInputElement? e, IInputElement container, KeyboardNavigationMode tabbingType)
         {
-            var parent = container.GetVisualParent<IInputElement>();
-            IInputElement? next = null;
+            // None groups: Tab navigation is not supported
+            if (tabbingType == KeyboardNavigationMode.None)
+                return null;
 
-            if (parent != null)
+            // e == null or e == container -> return the first TabStopOrGroup
+            if (e == null || e == container)
             {
-                if (direction == NavigationDirection.Previous &&
-                    parent.CanFocus() && 
-                    KeyboardNavigation.GetIsTabStop((InputElement) parent))
+                return GetFirstTabInGroup(container);
+            }
+
+            if (tabbingType == KeyboardNavigationMode.Once)
+                return null;
+
+            var nextTabElement = GetNextTabWithSameIndex(e, container);
+            if (nextTabElement != null)
+                return nextTabElement;
+
+            return GetNextTabWithNextIndex(e, container, tabbingType);
+        }
+
+        private static IInputElement? GetNextTabWithSameIndex(IInputElement e, IInputElement container)
+        {
+            var elementTabPriority = KeyboardNavigation.GetTabIndex(e);
+            var currElement = e;
+            while ((currElement = GetNextInTree(currElement, container)) != null)
+            {
+                if (IsTabStopOrGroup(currElement) && KeyboardNavigation.GetTabIndex(currElement) == elementTabPriority)
                 {
-                    return parent;
+                    return currElement;
                 }
+            }
 
-                var allSiblings = parent.GetVisualChildren()
-                    .OfType<IInputElement>()
-                    .Where(FocusExtensions.CanFocusDescendants);
-                var siblings = direction == NavigationDirection.Next ?
-                    allSiblings.SkipWhile(x => x != container).Skip(1) :
-                    allSiblings.TakeWhile(x => x != container).Reverse();
+            return null;
+        }
 
-                foreach (var sibling in siblings)
+        private static IInputElement? GetNextTabWithNextIndex(IInputElement e, IInputElement container, KeyboardNavigationMode tabbingType)
+        {
+            // Find the next min index in the tree
+            // min (index>currentTabIndex)
+            IInputElement? nextTabElement = null;
+            IInputElement? firstTabElement = null;
+            int minIndexFirstTab = int.MinValue;
+            int minIndex = int.MinValue;
+            int elementTabPriority = KeyboardNavigation.GetTabIndex(e);
+
+            IInputElement? currElement = container;
+            while ((currElement = GetNextInTree(currElement, container)) != null)
+            {
+                if (IsTabStopOrGroup(currElement))
                 {
-                    var customNext = GetCustomNext(sibling, direction);
-                    if (customNext.handled)
+                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
+                    if (currPriority > elementTabPriority)
                     {
-                        return customNext.next;
+                        if (currPriority < minIndex || nextTabElement == null)
+                        {
+                            minIndex = currPriority;
+                            nextTabElement = currElement;
+                        }
                     }
 
-                    if (sibling.CanFocus() && KeyboardNavigation.GetIsTabStop((InputElement) sibling))
+                    if (currPriority < minIndexFirstTab || firstTabElement == null)
                     {
-                        return sibling;
+                        minIndexFirstTab = currPriority;
+                        firstTabElement = currElement;
                     }
+                }
+            }
 
-                    next = direction == NavigationDirection.Next ?
-                        GetFocusableDescendants(sibling, direction).FirstOrDefault() :
-                        GetFocusableDescendants(sibling, direction).LastOrDefault();
+            // Cycle groups: if not found - return first element
+            if (tabbingType == KeyboardNavigationMode.Cycle && nextTabElement == null)
+                nextTabElement = firstTabElement;
+
+            return nextTabElement;
+        }
 
-                    if (next != null)
+        private static IInputElement? GetPrevTabInGroup(IInputElement? e, IInputElement container, KeyboardNavigationMode tabbingType)
+        {
+            // None groups: Tab navigation is not supported
+            if (tabbingType == KeyboardNavigationMode.None)
+                return null;
+
+            // Search the last index inside the group
+            if (e == null)
+            {
+                return GetLastTabInGroup(container);
+            }
+
+            if (tabbingType == KeyboardNavigationMode.Once)
+                return null;
+
+            if (e == container)
+                return null;
+
+            var nextTabElement = GetPrevTabWithSameIndex(e, container);
+            if (nextTabElement != null)
+                return nextTabElement;
+
+            return GetPrevTabWithPrevIndex(e, container, tabbingType);
+        }
+
+        private static IInputElement? GetPrevTabWithSameIndex(IInputElement e, IInputElement container)
+        {
+            int elementTabPriority = KeyboardNavigation.GetTabIndex(e);
+            var currElement = GetPreviousInTree(e, container);
+            while (currElement != null)
+            {
+                if (IsTabStopOrGroup(currElement) && KeyboardNavigation.GetTabIndex(currElement) == elementTabPriority && currElement != container)
+                {
+                    return currElement;
+                }
+                currElement = GetPreviousInTree(currElement, container);
+            }
+            return null;
+        }
+
+        private static IInputElement? GetPrevTabWithPrevIndex(IInputElement e, IInputElement container, KeyboardNavigationMode tabbingType)
+        {
+            // Find the next max index in the tree
+            // max (index<currentTabIndex)
+            IInputElement? lastTabElement = null;
+            IInputElement? nextTabElement = null;
+            int elementTabPriority = KeyboardNavigation.GetTabIndex(e);
+            int maxIndexFirstTab = Int32.MaxValue;
+            int maxIndex = Int32.MaxValue;
+            var currElement = GetLastInTree(container);
+            while (currElement != null)
+            {
+                if (IsTabStopOrGroup(currElement) && currElement != container)
+                {
+                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
+                    if (currPriority < elementTabPriority)
+                    {
+                        if (currPriority > maxIndex || nextTabElement == null)
+                        {
+                            maxIndex = currPriority;
+                            nextTabElement = currElement;
+                        }
+                    }
+
+                    if (currPriority > maxIndexFirstTab || lastTabElement == null)
                     {
-                        return next;
+                        maxIndexFirstTab = currPriority;
+                        lastTabElement = currElement;
                     }
                 }
 
-                next = GetFirstInNextContainer(element, parent, direction);
+                currElement = GetPreviousInTree(currElement, container);
+            }
+
+            // Cycle groups: if not found - return first element
+            if (tabbingType == KeyboardNavigationMode.Cycle && nextTabElement == null)
+                nextTabElement = lastTabElement;
+
+            return nextTabElement;
+        }
+
+        private static IInputElement? GetPreviousInTree(IInputElement e, IInputElement container)
+        {
+            if (e == container)
+                return null;
+
+            var result = GetPreviousSibling(e);
+
+            if (result != null)
+            {
+                if (IsGroup(result))
+                    return result;
+                else
+                    return GetLastInTree(result);
             }
             else
+                return GetParent(e);
+        }
+
+        private static IInputElement? GetPreviousSibling(IInputElement e)
+        {
+            if (GetParent(e) is IVisual parentAsVisual && e is IVisual elementAsVisual)
             {
-                next = direction == NavigationDirection.Next ?
-                    GetFocusableDescendants(container, direction).FirstOrDefault() :
-                    GetFocusableDescendants(container, direction).LastOrDefault();
+                var children = parentAsVisual.VisualChildren;
+                var count = children.Count;
+                IInputElement? prev = null;
+                
+                for (int i = 0; i < count; i++)
+                {
+                    var vchild = children[i];
+                    if (vchild == elementAsVisual)
+                        break;
+                    if (vchild.IsVisible == true && vchild is IInputElement ie)
+                        prev = ie;
+                }
+                return prev;
             }
+            return null;
+        }
 
-            return next;
+        private static IInputElement? GetActiveElement(IInputElement e)
+        {
+            return ((IAvaloniaObject)e).GetValue(KeyboardNavigation.TabOnceActiveElementProperty);
         }
 
-        private static (bool handled, IInputElement? next) GetCustomNext(IInputElement element,
-            NavigationDirection direction)
+        private static IInputElement GetGroupParent(IInputElement e) => GetGroupParent(e, false);
+
+        private static IInputElement GetGroupParent(IInputElement element, bool includeCurrent)
         {
-            if (element is ICustomKeyboardNavigation custom)
+            var result = element; // Keep the last non null element
+            var e = element;
+
+            // If we don't want to include the current element,
+            // start at the parent of the element.  If the element
+            // is the root, then just return it as the group parent.
+            if (!includeCurrent)
+            {
+                result = e;
+                e = GetParent(e);
+                if (e == null)
+                    return result;
+            }
+
+            while (e != null)
             {
-                return custom.GetNext(element, direction);
+                if (IsGroup(e))
+                    return e;
+
+                result = e;
+                e = GetParent(e);
             }
 
-            return (false, null);
+            return result;
         }
+
+        private static IInputElement? GetParent(IInputElement e)
+        {
+            // For Visual - go up the visual parent chain until we find Visual.
+            if (e is IVisual v)
+                return v.FindAncestorOfType<IInputElement>();
+
+            // This will need to be implemented when we have non-visual input elements.
+            throw new NotSupportedException();
+        }
+
+        private static KeyboardNavigationMode GetKeyNavigationMode(IInputElement e)
+        {
+            return ((IAvaloniaObject)e).GetValue(KeyboardNavigation.TabNavigationProperty);
+        }
+        private static bool IsFocusScope(IInputElement e) => FocusManager.GetIsFocusScope(e) || GetParent(e) == null;
+        private static bool IsGroup(IInputElement e) => GetKeyNavigationMode(e) != KeyboardNavigationMode.Continue;
+
+        private static bool IsTabStop(IInputElement e)
+        {
+            if (e is InputElement ie)
+                return ie.Focusable && KeyboardNavigation.GetIsTabStop(ie) && ie.IsVisible && ie.IsEnabled;
+            return false;
+        }
+
+        private static bool IsTabStopOrGroup(IInputElement e) => IsTabStop(e) || IsGroup(e);
     }
 }
diff --git a/src/Avalonia.Input/Platform/PlatformHotkeyConfiguration.cs b/src/Avalonia.Input/Platform/PlatformHotkeyConfiguration.cs
index 053f894755..521f847a0a 100644
--- a/src/Avalonia.Input/Platform/PlatformHotkeyConfiguration.cs
+++ b/src/Avalonia.Input/Platform/PlatformHotkeyConfiguration.cs
@@ -1,14 +1,16 @@
 using System.Collections.Generic;
 
+#nullable enable
+
 namespace Avalonia.Input.Platform
 {
     public class PlatformHotkeyConfiguration
     {
         public PlatformHotkeyConfiguration() : this(KeyModifiers.Control)
         {
-            
+
         }
-        
+
         public PlatformHotkeyConfiguration(KeyModifiers commandModifiers,
             KeyModifiers selectionModifiers = KeyModifiers.Shift,
             KeyModifiers wholeWordTextActionModifiers = KeyModifiers.Control)
@@ -73,8 +75,12 @@ namespace Avalonia.Input.Platform
             {
                 new KeyGesture(Key.End, commandModifiers | selectionModifiers)
             };
+            OpenContextMenu = new List<KeyGesture>
+            {
+                new KeyGesture(Key.Apps)
+            };
         }
-        
+
         public KeyModifiers CommandModifiers { get; set; }
         public KeyModifiers WholeWordTextActionModifiers { get; set; }
         public KeyModifiers SelectionModifiers { get; set; }
@@ -92,7 +98,6 @@ namespace Avalonia.Input.Platform
         public List<KeyGesture> MoveCursorToTheEndOfLineWithSelection { get; set; }
         public List<KeyGesture> MoveCursorToTheStartOfDocumentWithSelection { get; set; }
         public List<KeyGesture> MoveCursorToTheEndOfDocumentWithSelection { get; set; }
-        
-        
+        public List<KeyGesture> OpenContextMenu { get; set; }
     }
 }
diff --git a/src/Avalonia.Input/TappedEventArgs.cs b/src/Avalonia.Input/TappedEventArgs.cs
index 02add509cd..daaab70632 100644
--- a/src/Avalonia.Input/TappedEventArgs.cs
+++ b/src/Avalonia.Input/TappedEventArgs.cs
@@ -13,6 +13,10 @@ namespace Avalonia.Input
             this.lastPointerEventArgs = lastPointerEventArgs;
         }
 
+        public IPointer Pointer => lastPointerEventArgs.Pointer;
+        public KeyModifiers KeyModifiers => lastPointerEventArgs.KeyModifiers;
+        public ulong Timestamp => lastPointerEventArgs.Timestamp;
+        
         public Point GetPosition(IVisual? relativeTo) => lastPointerEventArgs.GetPosition(relativeTo);
     }
 }
diff --git a/src/Avalonia.Input/TextInput/ITextInputMethodClient.cs b/src/Avalonia.Input/TextInput/ITextInputMethodClient.cs
index d385f5b162..2b5d8958cc 100644
--- a/src/Avalonia.Input/TextInput/ITextInputMethodClient.cs
+++ b/src/Avalonia.Input/TextInput/ITextInputMethodClient.cs
@@ -22,11 +22,11 @@ namespace Avalonia.Input.TextInput
         /// </summary>
         event EventHandler TextViewVisualChanged;
         /// <summary>
-        /// Indicates if TextViewVisual is capable of displaying non-commited input on the cursor position
+        /// Indicates if TextViewVisual is capable of displaying non-committed input on the cursor position
         /// </summary>
         bool SupportsPreedit { get; }
         /// <summary>
-        /// Sets the non-commited input string
+        /// Sets the non-committed input string
         /// </summary>
         void SetPreeditText(string text);
         /// <summary>
diff --git a/src/Avalonia.Interactivity/Interactive.cs b/src/Avalonia.Interactivity/Interactive.cs
index 4cd810af20..2497150b1a 100644
--- a/src/Avalonia.Interactivity/Interactive.cs
+++ b/src/Avalonia.Interactivity/Interactive.cs
@@ -143,7 +143,7 @@ namespace Avalonia.Interactivity
         /// <param name="e">The routed event.</param>
         /// <returns>An <see cref="EventRoute"/> describing the route.</returns>
         /// <remarks>
-        /// Usually, calling <see cref="RaiseEvent(RoutedEventArgs)"/> is sufficent to raise a routed
+        /// Usually, calling <see cref="RaiseEvent(RoutedEventArgs)"/> is sufficient to raise a routed
         /// event, however there are situations in which the construction of the event args is expensive
         /// and should be avoided if there are no handlers for an event. In these cases you can call
         /// this method to build the event route and check the <see cref="EventRoute.HasHandlers"/>
diff --git a/src/Avalonia.Layout/ElementManager.cs b/src/Avalonia.Layout/ElementManager.cs
index 3f106708e6..c2f829d020 100644
--- a/src/Avalonia.Layout/ElementManager.cs
+++ b/src/Avalonia.Layout/ElementManager.cs
@@ -40,7 +40,7 @@ namespace Avalonia.Layout
             {
                 if (IsVirtualizingContext)
                 {
-                    // We proactively clear elements laid out outside of the realizaton
+                    // We proactively clear elements laid out outside of the realization
                     // rect so that they are available for reuse during the current
                     // measure pass.
                     // This is useful during fast panning scenarios in which the realization
diff --git a/src/Avalonia.Layout/FlowLayoutAlgorithm.cs b/src/Avalonia.Layout/FlowLayoutAlgorithm.cs
index eace54d2e0..63343fd1a7 100644
--- a/src/Avalonia.Layout/FlowLayoutAlgorithm.cs
+++ b/src/Avalonia.Layout/FlowLayoutAlgorithm.cs
@@ -22,7 +22,7 @@ namespace Avalonia.Layout
         private int _firstRealizedDataIndexInsideRealizationWindow = -1;
         private int _lastRealizedDataIndexInsideRealizationWindow = -1;
 
-        // If the scroll orientation is the same as the folow orientation
+        // If the scroll orientation is the same as the follow orientation
         // we will only have one line since we will never wrap. In that case
         // we do not want to align the line. We could potentially switch the
         // meaning of line alignment in this case, but I'll hold off on that
@@ -429,7 +429,7 @@ namespace Avalonia.Layout
 
                 // If we did not reach the top or bottom of the extent, we realized one 
                 // extra item before we knew we were outside the realization window. Do not
-                // account for that element in the indicies inside the realization window.
+                // account for that element in the indices inside the realization window.
                 if (direction == GenerateDirection.Forward)
                 {
                     int dataCount = _context.ItemCount;
diff --git a/src/Avalonia.Native/AvaloniaNativeApplicationPlatform.cs b/src/Avalonia.Native/AvaloniaNativeApplicationPlatform.cs
index 9579aa93b1..8084e06d28 100644
--- a/src/Avalonia.Native/AvaloniaNativeApplicationPlatform.cs
+++ b/src/Avalonia.Native/AvaloniaNativeApplicationPlatform.cs
@@ -1,14 +1,26 @@
 using System;
+using System.ComponentModel;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Native.Interop;
 using Avalonia.Platform;
 
 namespace Avalonia.Native
 {
-    internal class AvaloniaNativeApplicationPlatform : CallbackBase, IAvnApplicationEvents
+    internal class AvaloniaNativeApplicationPlatform : CallbackBase, IAvnApplicationEvents, IPlatformLifetimeEventsImpl
     {
+        public event EventHandler<ShutdownRequestedEventArgs> ShutdownRequested;
+        
         void IAvnApplicationEvents.FilesOpened(IAvnStringArray urls)
         {
             ((IApplicationPlatformEvents)Application.Current).RaiseUrlsOpened(urls.ToStringArray());
         }
+
+        public int TryShutdown()
+        {
+            if (ShutdownRequested is null) return 1;
+            var e = new ShutdownRequestedEventArgs();
+            ShutdownRequested(this, e);
+            return (!e.Cancel).AsComBool();
+        }
     }
 }
diff --git a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
index 2e3408eca5..89efa6af0c 100644
--- a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
+++ b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
@@ -138,7 +138,7 @@ namespace Avalonia.Native
             {
                 _nativeMenu = (__MicroComIAvnMenuProxy)__MicroComIAvnMenuProxy.Create(_factory);
 
-                _nativeMenu.Initialise(this, appMenuHolder, "");
+                _nativeMenu.Initialize(this, appMenuHolder, "");
 
                 setMenu = true;
             }
@@ -159,7 +159,7 @@ namespace Avalonia.Native
             {
                 _nativeMenu = __MicroComIAvnMenuProxy.Create(_factory);
 
-                _nativeMenu.Initialise(this, menu, "");     
+                _nativeMenu.Initialize(this, menu, "");     
 
                 setMenu = true;           
             }
diff --git a/src/Avalonia.Native/AvaloniaNativePlatform.cs b/src/Avalonia.Native/AvaloniaNativePlatform.cs
index 82a845ffc1..a7d05e416f 100644
--- a/src/Avalonia.Native/AvaloniaNativePlatform.cs
+++ b/src/Avalonia.Native/AvaloniaNativePlatform.cs
@@ -109,10 +109,17 @@ namespace Avalonia.Native
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop())
                 .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(60))
                 .Bind<ISystemDialogImpl>().ToConstant(new SystemDialogs(_factory.CreateSystemDialogs()))
-                .Bind<PlatformHotkeyConfiguration>().ToConstant(new PlatformHotkeyConfiguration(KeyModifiers.Meta))
+                .Bind<PlatformHotkeyConfiguration>().ToConstant(new PlatformHotkeyConfiguration(KeyModifiers.Meta, wholeWordTextActionModifiers: KeyModifiers.Alt))
                 .Bind<IMountedVolumeInfoProvider>().ToConstant(new MacOSMountedVolumeInfoProvider())
-                .Bind<IPlatformDragSource>().ToConstant(new AvaloniaNativeDragSource(_factory));
-
+                .Bind<IPlatformDragSource>().ToConstant(new AvaloniaNativeDragSource(_factory))
+                .Bind<IPlatformLifetimeEventsImpl>().ToConstant(applicationPlatform);
+
+            var hotkeys = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>();
+            hotkeys.MoveCursorToTheStartOfLine.Add(new KeyGesture(Key.Left, hotkeys.CommandModifiers));
+            hotkeys.MoveCursorToTheStartOfLineWithSelection.Add(new KeyGesture(Key.Left, hotkeys.CommandModifiers | hotkeys.SelectionModifiers));
+            hotkeys.MoveCursorToTheEndOfLine.Add(new KeyGesture(Key.Right, hotkeys.CommandModifiers));
+            hotkeys.MoveCursorToTheEndOfLineWithSelection.Add(new KeyGesture(Key.Right, hotkeys.CommandModifiers | hotkeys.SelectionModifiers));
+            
             if (_options.UseGpu)
             {
                 try
diff --git a/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs b/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
index 76cb7a8057..eef765e7ec 100644
--- a/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
+++ b/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
@@ -26,19 +26,52 @@ namespace Avalonia
         }
     }
 
+    /// <summary>
+    /// OSX backend options.
+    /// </summary>
     public class AvaloniaNativePlatformOptions
     {
+        /// <summary>
+        /// Deferred renderer would be used when set to true. Immediate renderer when set to false. The default value is true.
+        /// </summary>
+        /// <remarks>
+        /// Avalonia has two rendering modes: Immediate and Deferred rendering.
+        /// Immediate re-renders the whole scene when some element is changed on the scene. Deferred re-renders only changed elements.
+        /// </remarks>
         public bool UseDeferredRendering { get; set; } = true;
+
+        /// <summary>
+        /// Determines whether to use GPU for rendering in your project. The default value is true.
+        /// </summary>
         public bool UseGpu { get; set; } = true;
+
+        /// <summary>
+        /// Embeds popups to the window when set to true. The default value is false.
+        /// </summary>
         public bool OverlayPopups { get; set; }
+
+        /// <summary>
+        /// This property should be used in case you want to build Avalonia OSX native part by yourself
+        /// and make your Avalonia app run with it. The default value is null.
+        /// </summary>
         public string AvaloniaNativeLibraryPath { get; set; }
     }
 
     // ReSharper disable once InconsistentNaming
+    /// <summary>
+    /// OSX front-end options.
+    /// </summary>
     public class MacOSPlatformOptions
     {
+        /// <summary>
+        /// Determines whether to show your application in the dock when it runs. The default value is true.
+        /// </summary>
         public bool ShowInDock { get; set; } = true;
-        
+
+        /// <summary>
+        /// By default, Avalonia adds items like Quit, Hide to the OSX Application Menu.
+        /// You can prevent Avalonia from adding those items to the OSX Application Menu with this property. The default value is false.
+        /// </summary>
         public bool DisableDefaultApplicationMenuItems { get; set; }
     }
 }
diff --git a/src/Avalonia.Native/IAvnMenu.cs b/src/Avalonia.Native/IAvnMenu.cs
index f76e9450fc..0e6fdd2df0 100644
--- a/src/Avalonia.Native/IAvnMenu.cs
+++ b/src/Avalonia.Native/IAvnMenu.cs
@@ -96,7 +96,7 @@ namespace Avalonia.Native.Interop.Impl
             _menuItems.Remove(item);
             RemoveItem(item);
 
-            item.Deinitialise();
+            item.Deinitialize();
             item.Dispose();
         }
 
@@ -113,7 +113,7 @@ namespace Avalonia.Native.Interop.Impl
         {
             var result = CreateNew(factory, item);
 
-            result.Initialise(item);
+            result.Initialize(item);
 
             _menuItemLookup.Add(result.ManagedMenuItem, result);
             _menuItems.Insert(index, result);
@@ -133,7 +133,7 @@ namespace Avalonia.Native.Interop.Impl
             return nativeItem;
         }
 
-        internal void Initialise(AvaloniaNativeMenuExporter exporter, NativeMenu managedMenu, string title)
+        internal void Initialize(AvaloniaNativeMenuExporter exporter, NativeMenu managedMenu, string title)
         {
             _exporter = exporter;
             ManagedMenu = managedMenu;
@@ -150,7 +150,7 @@ namespace Avalonia.Native.Interop.Impl
 
             foreach (var item in _menuItems)
             {
-                item.Deinitialise();
+                item.Deinitialize();
                 item.Dispose();
             }
         }
diff --git a/src/Avalonia.Native/IAvnMenuItem.cs b/src/Avalonia.Native/IAvnMenuItem.cs
index 97838f8dea..ca99cbea4b 100644
--- a/src/Avalonia.Native/IAvnMenuItem.cs
+++ b/src/Avalonia.Native/IAvnMenuItem.cs
@@ -85,7 +85,7 @@ namespace Avalonia.Native.Interop.Impl
             SetAction(action, callback);
         }
 
-        internal void Initialise(NativeMenuItemBase nativeMenuItem)
+        internal void Initialize(NativeMenuItemBase nativeMenuItem)
         {
             ManagedMenuItem = nativeMenuItem;
 
@@ -123,7 +123,7 @@ namespace Avalonia.Native.Interop.Impl
             }
         }
 
-        internal void Deinitialise()
+        internal void Deinitialize()
         {
             if (_subMenu != null)
             {
@@ -150,7 +150,7 @@ namespace Avalonia.Native.Interop.Impl
                 {
                     _subMenu = __MicroComIAvnMenuProxy.Create(factory);
 
-                    _subMenu.Initialise(exporter, item.Menu, item.Header);
+                    _subMenu.Initialize(exporter, item.Menu, item.Header);
 
                     SetSubMenu(_subMenu);
                 }
diff --git a/src/Avalonia.Native/PopupImpl.cs b/src/Avalonia.Native/PopupImpl.cs
index c36675afcd..4680a2af17 100644
--- a/src/Avalonia.Native/PopupImpl.cs
+++ b/src/Avalonia.Native/PopupImpl.cs
@@ -32,7 +32,7 @@ namespace Avalonia.Native
         private void MoveResize(PixelPoint position, Size size, double scaling)
         {
             Position = position;
-            Resize(size);
+            Resize(size, PlatformResizeReason.Layout);
             //TODO: We ignore the scaling override for now
         }
 
@@ -60,14 +60,14 @@ namespace Avalonia.Native
             }
         }
 
-        public override void Show(bool activate)
+        public override void Show(bool activate, bool isDialog)
         {
             var parent = _parent;
             while (parent is PopupImpl p) 
                 parent = p._parent;
             if (parent is WindowImpl w)
                 w.Native.TakeFocusFromChildren();
-            base.Show(false);
+            base.Show(false, isDialog);
         }
 
         public override IPopupImpl CreatePopup() => new PopupImpl(_factory, _opts, _glFeature, this);
diff --git a/src/Avalonia.Native/WindowImpl.cs b/src/Avalonia.Native/WindowImpl.cs
index f3b60f07be..f740be44a2 100644
--- a/src/Avalonia.Native/WindowImpl.cs
+++ b/src/Avalonia.Native/WindowImpl.cs
@@ -114,7 +114,7 @@ namespace Avalonia.Native
                 {
                     var visual = (_inputRoot as Window).Renderer.HitTestFirst(e.Position, _inputRoot as Window, x =>
                             {
-                                if (x is IInputElement ie && !ie.IsHitTestVisible)
+                                if (x is IInputElement ie && (!ie.IsHitTestVisible || !ie.IsVisible))
                                 {
                                     return false;
                                 }
diff --git a/src/Avalonia.Native/WindowImplBase.cs b/src/Avalonia.Native/WindowImplBase.cs
index ced9cea3a8..4a3baa2788 100644
--- a/src/Avalonia.Native/WindowImplBase.cs
+++ b/src/Avalonia.Native/WindowImplBase.cs
@@ -87,7 +87,7 @@ namespace Avalonia.Native
             var monitor = Screen.AllScreens.OrderBy(x => x.PixelDensity)
                     .FirstOrDefault(m => m.Bounds.Contains(Position));
 
-            Resize(new Size(monitor.WorkingArea.Width * 0.75d, monitor.WorkingArea.Height * 0.7d));
+            Resize(new Size(monitor.WorkingArea.Width * 0.75d, monitor.WorkingArea.Height * 0.7d), PlatformResizeReason.Layout);
         }
 
         public Size ClientSize 
@@ -146,7 +146,7 @@ namespace Avalonia.Native
         public Action LostFocus { get; set; }
         
         public Action<Rect> Paint { get; set; }
-        public Action<Size> Resized { get; set; }
+        public Action<Size, PlatformResizeReason> Resized { get; set; }
         public Action Closed { get; set; }
         public IMouseDevice MouseDevice => _mouse;
         public abstract IPopupImpl CreatePopup();
@@ -186,13 +186,13 @@ namespace Avalonia.Native
                 _parent.Paint?.Invoke(new Rect(0, 0, s.Width, s.Height));
             }
 
-            void IAvnWindowBaseEvents.Resized(AvnSize* size)
+            void IAvnWindowBaseEvents.Resized(AvnSize* size, AvnPlatformResizeReason reason)
             {
                 if (_parent?._native != null)
                 {
                     var s = new Size(size->Width, size->Height);
                     _parent._savedLogicalSize = s;
-                    _parent.Resized?.Invoke(s);
+                    _parent.Resized?.Invoke(s, (PlatformResizeReason)reason);
                 }
             }
 
@@ -320,9 +320,9 @@ namespace Avalonia.Native
             }
         }
 
-        public void Resize(Size clientSize)
+        public void Resize(Size clientSize, PlatformResizeReason reason)
         {
-            _native.Resize(clientSize.Width, clientSize.Height);
+            _native.Resize(clientSize.Width, clientSize.Height, (AvnPlatformResizeReason)reason);
         }
 
         public IRenderer CreateRenderer(IRenderRoot root)
@@ -365,9 +365,9 @@ namespace Avalonia.Native
         }
 
 
-        public virtual void Show(bool activate)
+        public virtual void Show(bool activate, bool isDialog)
         {
-            _native.Show(activate.AsComBool());
+            _native.Show(activate.AsComBool(), isDialog.AsComBool());
         }
 
 
diff --git a/src/Avalonia.Native/avn.idl b/src/Avalonia.Native/avn.idl
index 89e20463d8..70d85dacdd 100644
--- a/src/Avalonia.Native/avn.idl
+++ b/src/Avalonia.Native/avn.idl
@@ -400,6 +400,15 @@ enum AvnExtendClientAreaChromeHints
     AvnDefaultChrome = AvnPreferSystemChrome,
 }
 
+enum AvnPlatformResizeReason
+{
+    ResizeUnspecified,
+    ResizeUser,
+    ResizeApplication,
+    ResizeLayout,
+    ResizeDpiChange,
+}
+
 [uuid(809c652e-7396-11d2-9771-00a0c9b4d50c)]
 interface IAvaloniaNativeFactory : IUnknown
 {
@@ -430,7 +439,7 @@ interface IAvnString : IUnknown
 [uuid(e5aca675-02b7-4129-aa79-d6e417210bda)]
 interface IAvnWindowBase : IUnknown
 {
-     HRESULT Show(bool activate);
+     HRESULT Show(bool activate, bool isDialog);
      HRESULT Hide();
      HRESULT Close();
      HRESULT Activate();
@@ -438,7 +447,7 @@ interface IAvnWindowBase : IUnknown
      HRESULT GetFrameSize(AvnSize*ret);
      HRESULT GetScaling(double*ret);
      HRESULT SetMinMaxSize(AvnSize minSize, AvnSize maxSize);
-     HRESULT Resize(double width, double height);
+     HRESULT Resize(double width, double height, AvnPlatformResizeReason reason);
      HRESULT Invalidate(AvnRect rect);
      HRESULT BeginMoveDrag();
      HRESULT BeginResizeDrag(AvnWindowEdge edge);
@@ -492,7 +501,7 @@ interface IAvnWindowBaseEvents : IUnknown
      void Closed();
      void Activated();
      void Deactivated();
-     void Resized([const] AvnSize& size);
+     void Resized([const] AvnSize& size, AvnPlatformResizeReason reason);
      void PositionChanged(AvnPoint position);
      void RawMouseEvent(AvnRawMouseEventType type,
                                 uint timeStamp,
@@ -733,4 +742,5 @@ interface IAvnNativeControlHostTopLevelAttachment : IUnknown
 interface IAvnApplicationEvents : IUnknown
 {
      void FilesOpened (IAvnStringArray* urls);
+     bool TryShutdown();
 }
diff --git a/src/Avalonia.Themes.Default/AutoCompleteBox.xaml b/src/Avalonia.Themes.Default/AutoCompleteBox.xaml
index 66d0f17ede..fe4cd48e72 100644
--- a/src/Avalonia.Themes.Default/AutoCompleteBox.xaml
+++ b/src/Avalonia.Themes.Default/AutoCompleteBox.xaml
@@ -11,6 +11,7 @@
                    Background="{TemplateBinding Background}" 
                    BorderBrush="{TemplateBinding BorderBrush}" 
                    BorderThickness="{TemplateBinding BorderThickness}"
+                   CornerRadius="{TemplateBinding CornerRadius}"
                    Padding="{TemplateBinding Padding}"
                    Watermark="{TemplateBinding Watermark}"
                    DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" />
diff --git a/src/Avalonia.Themes.Default/Button.xaml b/src/Avalonia.Themes.Default/Button.xaml
index 698ddec2a8..81d96aaa14 100644
--- a/src/Avalonia.Themes.Default/Button.xaml
+++ b/src/Avalonia.Themes.Default/Button.xaml
@@ -13,6 +13,7 @@
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding Content}"
                           Padding="{TemplateBinding Padding}"
@@ -31,4 +32,4 @@
   <Style Selector="Button:disabled">
     <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
   </Style>
-</Styles>
\ No newline at end of file
+</Styles>
diff --git a/src/Avalonia.Themes.Default/ButtonSpinner.xaml b/src/Avalonia.Themes.Default/ButtonSpinner.xaml
index 89fbb9d64d..ce2b85d2b5 100644
--- a/src/Avalonia.Themes.Default/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Default/ButtonSpinner.xaml
@@ -47,6 +47,7 @@
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
                 Margin="{TemplateBinding Padding}"
                 HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                 VerticalAlignment="{TemplateBinding VerticalAlignment}">
@@ -73,6 +74,7 @@
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
                 Margin="{TemplateBinding Padding}"
                 HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                 VerticalAlignment="{TemplateBinding VerticalAlignment}">
diff --git a/src/Avalonia.Themes.Default/Calendar.xaml b/src/Avalonia.Themes.Default/Calendar.xaml
index 6bbee4ef17..4b67aa232b 100644
--- a/src/Avalonia.Themes.Default/Calendar.xaml
+++ b/src/Avalonia.Themes.Default/Calendar.xaml
@@ -22,10 +22,11 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
                         HeaderBackground="{TemplateBinding HeaderBackground}"/>
 
         </StackPanel>
       </ControlTemplate>
     </Setter>
   </Style>
-</Styles>
\ No newline at end of file
+</Styles>
diff --git a/src/Avalonia.Themes.Default/CalendarDatePicker.xaml b/src/Avalonia.Themes.Default/CalendarDatePicker.xaml
index aab7d06c46..57b77f70ea 100644
--- a/src/Avalonia.Themes.Default/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Default/CalendarDatePicker.xaml
@@ -88,7 +88,8 @@
           <TextBox Name="PART_TextBox"
                    Background="{TemplateBinding Background}" 
                    BorderBrush="{TemplateBinding BorderBrush}" 
-                   BorderThickness="{TemplateBinding BorderThickness}" 
+                   BorderThickness="{TemplateBinding BorderThickness}"
+                   CornerRadius="{TemplateBinding CornerRadius}"
                    Padding="{TemplateBinding Padding}"
                    Watermark="{TemplateBinding Watermark}"
                    UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
diff --git a/src/Avalonia.Themes.Default/CalendarItem.xaml b/src/Avalonia.Themes.Default/CalendarItem.xaml
index dfd89ed82f..5b7ae5061a 100644
--- a/src/Avalonia.Themes.Default/CalendarItem.xaml
+++ b/src/Avalonia.Themes.Default/CalendarItem.xaml
@@ -8,14 +8,15 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Style Selector="CalendarItem">
+    <Setter Property="CornerRadius" Value="1" />
     <Setter Property="Template">
       <ControlTemplate>
         <Panel>
           <Border BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   Background="{TemplateBinding Background}"
-                  Margin="0,2,0,2"
-                  CornerRadius="1">
+                  Margin="0,2,0,2">
 
             <Border CornerRadius="1"
                     BorderBrush="{DynamicResource ThemeBackgroundBrush}"
diff --git a/src/Avalonia.Themes.Default/Carousel.xaml b/src/Avalonia.Themes.Default/Carousel.xaml
index 955a49a974..baba0649aa 100644
--- a/src/Avalonia.Themes.Default/Carousel.xaml
+++ b/src/Avalonia.Themes.Default/Carousel.xaml
@@ -3,7 +3,8 @@
     <ControlTemplate>
       <Border Background="{TemplateBinding Background}"
               BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}">
+              BorderThickness="{TemplateBinding BorderThickness}"
+              CornerRadius="{TemplateBinding CornerRadius}">
         <CarouselPresenter IsVirtualized="{TemplateBinding IsVirtualized}"
                            Items="{TemplateBinding Items}"
                            ItemsPanel="{TemplateBinding ItemsPanel}"
diff --git a/src/Avalonia.Themes.Default/CheckBox.xaml b/src/Avalonia.Themes.Default/CheckBox.xaml
index f87ae2674f..5e10b319a7 100644
--- a/src/Avalonia.Themes.Default/CheckBox.xaml
+++ b/src/Avalonia.Themes.Default/CheckBox.xaml
@@ -14,6 +14,7 @@
                   Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}"
                   Width="18"
                   Height="18"
                   VerticalAlignment="Center">
diff --git a/src/Avalonia.Themes.Default/ComboBox.xaml b/src/Avalonia.Themes.Default/ComboBox.xaml
index 67151731a8..754aadac83 100644
--- a/src/Avalonia.Themes.Default/ComboBox.xaml
+++ b/src/Avalonia.Themes.Default/ComboBox.xaml
@@ -32,7 +32,8 @@
         <Border Name="border"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}">
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
           <Grid ColumnDefinitions="*,Auto">
             <TextBlock Name="PlaceholderTextBlock"
                        Grid.Column="0"
diff --git a/src/Avalonia.Themes.Default/ComboBoxItem.xaml b/src/Avalonia.Themes.Default/ComboBoxItem.xaml
index 23456ec744..a694143bec 100644
--- a/src/Avalonia.Themes.Default/ComboBoxItem.xaml
+++ b/src/Avalonia.Themes.Default/ComboBoxItem.xaml
@@ -10,6 +10,7 @@
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding Content}"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
diff --git a/src/Avalonia.Themes.Default/ContentControl.xaml b/src/Avalonia.Themes.Default/ContentControl.xaml
index d76eecee84..d32bc399b6 100644
--- a/src/Avalonia.Themes.Default/ContentControl.xaml
+++ b/src/Avalonia.Themes.Default/ContentControl.xaml
@@ -5,6 +5,7 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
                         ContentTemplate="{TemplateBinding ContentTemplate}"
                         Content="{TemplateBinding Content}"
                         Padding="{TemplateBinding Padding}"
@@ -12,4 +13,4 @@
                         HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
     </ControlTemplate>
   </Setter>
-</Style>
\ No newline at end of file
+</Style>
diff --git a/src/Avalonia.Themes.Default/ContextMenu.xaml b/src/Avalonia.Themes.Default/ContextMenu.xaml
index 9b84253c8a..0df4866184 100644
--- a/src/Avalonia.Themes.Default/ContextMenu.xaml
+++ b/src/Avalonia.Themes.Default/ContextMenu.xaml
@@ -9,6 +9,7 @@
       <Border Background="{TemplateBinding Background}"
               BorderBrush="{TemplateBinding BorderBrush}"
               BorderThickness="{TemplateBinding BorderThickness}"
+              CornerRadius="{TemplateBinding CornerRadius}"
               Padding="{TemplateBinding Padding}">
           <ScrollViewer Classes="menuscroller">
               <ItemsPresenter Name="PART_ItemsPresenter"
diff --git a/src/Avalonia.Themes.Default/DataValidationErrors.xaml b/src/Avalonia.Themes.Default/DataValidationErrors.xaml
index f4145a51f5..a3a4cf4662 100644
--- a/src/Avalonia.Themes.Default/DataValidationErrors.xaml
+++ b/src/Avalonia.Themes.Default/DataValidationErrors.xaml
@@ -12,6 +12,7 @@
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding Content}"
                           Padding="{TemplateBinding Padding}"/>
diff --git a/src/Avalonia.Themes.Default/DatePicker.xaml b/src/Avalonia.Themes.Default/DatePicker.xaml
index da878c88e2..c6c117138d 100644
--- a/src/Avalonia.Themes.Default/DatePicker.xaml
+++ b/src/Avalonia.Themes.Default/DatePicker.xaml
@@ -134,6 +134,7 @@
                   Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}"
                   IsEnabled="{TemplateBinding IsEnabled}"
                   MinWidth="{DynamicResource DatePickerThemeMinWidth}"
                   MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
@@ -148,6 +149,7 @@
                                   BorderBrush="{TemplateBinding BorderBrush}"
                                   Background="{TemplateBinding Background}"
                                   BorderThickness="{TemplateBinding BorderThickness}"
+                                  CornerRadius="{TemplateBinding CornerRadius}"
                                   Content="{TemplateBinding Content}"
                                   TextBlock.Foreground="{TemplateBinding Foreground}"
                                   HorizontalContentAlignment="Stretch"
@@ -242,6 +244,7 @@
         <Border Name="Background" Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
                 Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
                 MaxHeight="398">
           <Grid Name="ContentRoot" RowDefinitions="*,Auto">
diff --git a/src/Avalonia.Themes.Default/Expander.xaml b/src/Avalonia.Themes.Default/Expander.xaml
index 08d8b4c995..5e0958c54c 100644
--- a/src/Avalonia.Themes.Default/Expander.xaml
+++ b/src/Avalonia.Themes.Default/Expander.xaml
@@ -10,7 +10,10 @@
   <Style Selector="Expander[ExpandDirection=Down]">
     <Setter Property="Template">
       <ControlTemplate>
-        <Border Background="{TemplateBinding Background}">
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
           <Grid RowDefinitions="Auto,*">
             <ToggleButton Name="PART_toggle" Grid.Row="0"  Content="{TemplateBinding Header}" IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
             <ContentPresenter Name="PART_ContentPresenter"
diff --git a/src/Avalonia.Themes.Default/GridSplitter.xaml b/src/Avalonia.Themes.Default/GridSplitter.xaml
index 6d9cb4f31f..490ae01318 100644
--- a/src/Avalonia.Themes.Default/GridSplitter.xaml
+++ b/src/Avalonia.Themes.Default/GridSplitter.xaml
@@ -15,6 +15,7 @@
         <Border 
           BorderBrush="{TemplateBinding BorderBrush}"
           BorderThickness="{TemplateBinding BorderThickness}"
+          CornerRadius="{TemplateBinding CornerRadius}"
           Background="{TemplateBinding Background}"/>
       </ControlTemplate>
     </Setter>
diff --git a/src/Avalonia.Themes.Default/ItemsControl.xaml b/src/Avalonia.Themes.Default/ItemsControl.xaml
index 8bb0fc297c..19d13b6399 100644
--- a/src/Avalonia.Themes.Default/ItemsControl.xaml
+++ b/src/Avalonia.Themes.Default/ItemsControl.xaml
@@ -4,6 +4,7 @@
       <Border Background="{TemplateBinding Background}"
               BorderBrush="{TemplateBinding BorderBrush}"
               BorderThickness="{TemplateBinding BorderThickness}"
+              CornerRadius="{TemplateBinding CornerRadius}"
               Padding="{TemplateBinding Padding}">
         <ItemsPresenter Name="PART_ItemsPresenter"
                         Items="{TemplateBinding Items}"
diff --git a/src/Avalonia.Themes.Default/Label.xaml b/src/Avalonia.Themes.Default/Label.xaml
index d93381aa69..1e04d05497 100644
--- a/src/Avalonia.Themes.Default/Label.xaml
+++ b/src/Avalonia.Themes.Default/Label.xaml
@@ -6,6 +6,7 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
                         ContentTemplate="{TemplateBinding ContentTemplate}"
                         Content="{TemplateBinding Content}"
                         Padding="{TemplateBinding Padding}"
diff --git a/src/Avalonia.Themes.Default/ListBox.xaml b/src/Avalonia.Themes.Default/ListBox.xaml
index 1ad996a1a0..e3417aa086 100644
--- a/src/Avalonia.Themes.Default/ListBox.xaml
+++ b/src/Avalonia.Themes.Default/ListBox.xaml
@@ -9,7 +9,8 @@
   <Setter Property="Template">
     <ControlTemplate>
       <Border Name="border" BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}">
+              BorderThickness="{TemplateBinding BorderThickness}"
+              CornerRadius="{TemplateBinding CornerRadius}">
         <ScrollViewer Name="PART_ScrollViewer"
                       Background="{TemplateBinding Background}"
                       HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
diff --git a/src/Avalonia.Themes.Default/ListBoxItem.xaml b/src/Avalonia.Themes.Default/ListBoxItem.xaml
index 19a6e3d4ec..c1360c5d98 100644
--- a/src/Avalonia.Themes.Default/ListBoxItem.xaml
+++ b/src/Avalonia.Themes.Default/ListBoxItem.xaml
@@ -10,6 +10,7 @@
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding Content}"
                           Padding="{TemplateBinding Padding}"
diff --git a/src/Avalonia.Themes.Default/Menu.xaml b/src/Avalonia.Themes.Default/Menu.xaml
index a1a5afb4a9..583add1017 100644
--- a/src/Avalonia.Themes.Default/Menu.xaml
+++ b/src/Avalonia.Themes.Default/Menu.xaml
@@ -4,6 +4,7 @@
       <Border Background="{TemplateBinding Background}"
               BorderBrush="{TemplateBinding BorderBrush}"
               BorderThickness="{TemplateBinding BorderThickness}"
+              CornerRadius="{TemplateBinding CornerRadius}"
               Padding="{TemplateBinding Padding}">
         <ItemsPresenter Name="PART_ItemsPresenter" 
                         Items="{TemplateBinding Items}" 
@@ -13,4 +14,4 @@
       </Border>
     </ControlTemplate>
   </Setter>
-</Style>
\ No newline at end of file
+</Style>
diff --git a/src/Avalonia.Themes.Default/MenuItem.xaml b/src/Avalonia.Themes.Default/MenuItem.xaml
index 4bfae4c223..18bf79ce6c 100644
--- a/src/Avalonia.Themes.Default/MenuItem.xaml
+++ b/src/Avalonia.Themes.Default/MenuItem.xaml
@@ -14,7 +14,8 @@
         <Border Name="root"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}">
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
           <Grid>
             <Grid.ColumnDefinitions>
               <ColumnDefinition Width="20"/>
@@ -96,7 +97,8 @@
         <Border Name="root"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}">
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
           <Panel>
             <ContentPresenter Name="PART_HeaderPresenter"
                               Content="{TemplateBinding Header}"
diff --git a/src/Avalonia.Themes.Default/NotificationCard.xaml b/src/Avalonia.Themes.Default/NotificationCard.xaml
index 47d5988e8c..c411fede11 100644
--- a/src/Avalonia.Themes.Default/NotificationCard.xaml
+++ b/src/Avalonia.Themes.Default/NotificationCard.xaml
@@ -12,6 +12,7 @@
                     <Border Background="{TemplateBinding Background}" 
                             BorderBrush="{TemplateBinding BorderBrush}" 
                             BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
                             Margin="8,8,0,0">
                         <ContentControl Name="PART_Content" Content="{TemplateBinding Content}" />
                     </Border>
diff --git a/src/Avalonia.Themes.Default/NumericUpDown.xaml b/src/Avalonia.Themes.Default/NumericUpDown.xaml
index 025e822404..6740be69bb 100644
--- a/src/Avalonia.Themes.Default/NumericUpDown.xaml
+++ b/src/Avalonia.Themes.Default/NumericUpDown.xaml
@@ -9,6 +9,7 @@
         <ButtonSpinner Name="PART_Spinner"
                        Background="{TemplateBinding Background}"
                        BorderThickness="{TemplateBinding BorderThickness}"
+                       CornerRadius="{TemplateBinding CornerRadius}"
                        BorderBrush="{TemplateBinding BorderBrush}"
                        HorizontalContentAlignment="Stretch"
                        VerticalContentAlignment="Stretch"
@@ -18,7 +19,6 @@
           <TextBox Name="PART_TextBox"
                    BorderThickness="0"
                    Background="{TemplateBinding Background}" 
-                   BorderBrush="{TemplateBinding BorderBrush}"
                    Padding="{TemplateBinding Padding}"
                    Watermark="{TemplateBinding Watermark}"
                    DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
diff --git a/src/Avalonia.Themes.Default/ProgressBar.xaml b/src/Avalonia.Themes.Default/ProgressBar.xaml
index fb4b23b9ad..fd847b5d65 100644
--- a/src/Avalonia.Themes.Default/ProgressBar.xaml
+++ b/src/Avalonia.Themes.Default/ProgressBar.xaml
@@ -16,7 +16,7 @@
     <Setter Property="Template">
       <ControlTemplate>
         <Grid>
-          <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+          <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}">
             <Panel>
               <Border Name="PART_Indicator" Background="{TemplateBinding Foreground}" IsVisible="{Binding !IsIndeterminate, RelativeSource={RelativeSource TemplatedParent}}"/>
               <Border Name="PART_IndeterminateIndicator" Background="{TemplateBinding Foreground}" IsVisible="{Binding IsIndeterminate, RelativeSource={RelativeSource TemplatedParent}}"/>
diff --git a/src/Avalonia.Themes.Default/RepeatButton.xaml b/src/Avalonia.Themes.Default/RepeatButton.xaml
index 702e4e6ebd..a9a03c8ed5 100644
--- a/src/Avalonia.Themes.Default/RepeatButton.xaml
+++ b/src/Avalonia.Themes.Default/RepeatButton.xaml
@@ -20,6 +20,7 @@
                                   Background="{TemplateBinding Background}"
                                   BorderBrush="{TemplateBinding BorderBrush}"
                                   BorderThickness="{TemplateBinding BorderThickness}"
+                                  CornerRadius="{TemplateBinding CornerRadius}"
                                   ContentTemplate="{TemplateBinding ContentTemplate}"
                                   Content="{TemplateBinding Content}"
                                   Padding="{TemplateBinding Padding}"
diff --git a/src/Avalonia.Themes.Default/Separator.xaml b/src/Avalonia.Themes.Default/Separator.xaml
index cf0db16ee6..6a318d2e85 100644
--- a/src/Avalonia.Themes.Default/Separator.xaml
+++ b/src/Avalonia.Themes.Default/Separator.xaml
@@ -6,6 +6,7 @@
       <ControlTemplate>
         <Border BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
                 Background="{TemplateBinding Background}"/>
       </ControlTemplate>
     </Setter>
diff --git a/src/Avalonia.Themes.Default/TabControl.xaml b/src/Avalonia.Themes.Default/TabControl.xaml
index ed2e67df28..afb5010baa 100644
--- a/src/Avalonia.Themes.Default/TabControl.xaml
+++ b/src/Avalonia.Themes.Default/TabControl.xaml
@@ -3,9 +3,9 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <Border
-                    Margin="{TemplateBinding Margin}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
                     Background="{TemplateBinding Background}"
                     HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                     VerticalAlignment="{TemplateBinding VerticalAlignment}">
diff --git a/src/Avalonia.Themes.Default/TabItem.xaml b/src/Avalonia.Themes.Default/TabItem.xaml
index 6e344ce58e..c7748299a0 100644
--- a/src/Avalonia.Themes.Default/TabItem.xaml
+++ b/src/Avalonia.Themes.Default/TabItem.xaml
@@ -12,11 +12,11 @@
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
                     ContentTemplate="{TemplateBinding HeaderTemplate}"
                     Content="{TemplateBinding Header}"
                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                    Margin="{TemplateBinding Margin}"
                     Padding="{TemplateBinding Padding}"/>
             </ControlTemplate>
         </Setter>
diff --git a/src/Avalonia.Themes.Default/TabStripItem.xaml b/src/Avalonia.Themes.Default/TabStripItem.xaml
index 28c4c68a3d..61eecc0395 100644
--- a/src/Avalonia.Themes.Default/TabStripItem.xaml
+++ b/src/Avalonia.Themes.Default/TabStripItem.xaml
@@ -9,6 +9,7 @@
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding Content}"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -20,4 +21,4 @@
   <Style Selector="TabStripItem:selected">
     <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
   </Style>
-</Styles>
\ No newline at end of file
+</Styles>
diff --git a/src/Avalonia.Themes.Default/TextBox.xaml b/src/Avalonia.Themes.Default/TextBox.xaml
index c68355a57d..9471beaaeb 100644
--- a/src/Avalonia.Themes.Default/TextBox.xaml
+++ b/src/Avalonia.Themes.Default/TextBox.xaml
@@ -4,7 +4,7 @@
     <StreamGeometry x:Key="PasswordBoxRevealButtonData">m10.051 7.0032c2.215 0 4.0105 1.7901 4.0105 3.9984s-1.7956 3.9984-4.0105 3.9984c-2.215 0-4.0105-1.7901-4.0105-3.9984s1.7956-3.9984 4.0105-3.9984zm0 1.4994c-1.3844 0-2.5066 1.1188-2.5066 2.499s1.1222 2.499 2.5066 2.499 2.5066-1.1188 2.5066-2.499-1.1222-2.499-2.5066-2.499zm0-5.0026c4.6257 0 8.6188 3.1487 9.7267 7.5613 0.10085 0.40165-0.14399 0.80877-0.54686 0.90931-0.40288 0.10054-0.81122-0.14355-0.91208-0.54521-0.94136-3.7492-4.3361-6.4261-8.2678-6.4261-3.9334 0-7.3292 2.6792-8.2689 6.4306-0.10063 0.40171-0.50884 0.64603-0.91177 0.54571s-0.648-0.5073-0.54737-0.90901c1.106-4.4152 5.1003-7.5667 9.728-7.5667z</StreamGeometry>
     <StreamGeometry x:Key="PasswordBoxHideButtonData">m0.21967 0.21965c-0.26627 0.26627-0.29047 0.68293-0.07262 0.97654l0.07262 0.08412 4.0346 4.0346c-1.922 1.3495-3.3585 3.365-3.9554 5.7495-0.10058 0.4018 0.14362 0.8091 0.54543 0.9097 0.40182 0.1005 0.80909-0.1436 0.90968-0.5455 0.52947-2.1151 1.8371-3.8891 3.5802-5.0341l1.8096 1.8098c-0.70751 0.7215-1.1438 1.71-1.1438 2.8003 0 2.2092 1.7909 4 4 4 1.0904 0 2.0788-0.4363 2.8004-1.1438l5.9193 5.9195c0.2929 0.2929 0.7677 0.2929 1.0606 0 0.2663-0.2662 0.2905-0.6829 0.0726-0.9765l-0.0726-0.0841-6.1135-6.1142 0.0012-0.0015-1.2001-1.1979-2.8699-2.8693 2e-3 -8e-4 -2.8812-2.8782 0.0012-0.0018-1.1333-1.1305-4.3064-4.3058c-0.29289-0.29289-0.76777-0.29289-1.0607 0zm7.9844 9.0458 3.5351 3.5351c-0.45 0.4358-1.0633 0.704-1.7392 0.704-1.3807 0-2.5-1.1193-2.5-2.5 0-0.6759 0.26824-1.2892 0.7041-1.7391zm1.7959-5.7655c-1.0003 0-1.9709 0.14807-2.8889 0.425l1.237 1.2362c0.5358-0.10587 1.0883-0.16119 1.6519-0.16119 3.9231 0 7.3099 2.6803 8.2471 6.4332 0.1004 0.4018 0.5075 0.6462 0.9094 0.5459 0.4019-0.1004 0.6463-0.5075 0.5459-0.9094-1.103-4.417-5.0869-7.5697-9.7024-7.5697zm0.1947 3.5093 3.8013 3.8007c-0.1018-2.0569-1.7488-3.7024-3.8013-3.8007z</StreamGeometry>
 
-    <MenuFlyout x:Key="DefaultTextBoxContextFlyout">
+    <MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
       <MenuItem x:Name="TextBoxContextFlyoutCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
       <MenuItem x:Name="TextBoxContextFlyoutCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
       <MenuItem x:Name="TextBoxContextFlyoutPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
@@ -30,7 +30,8 @@
         <Border Name="border"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}">
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
           <DockPanel Margin="{TemplateBinding Padding}"
                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
diff --git a/src/Avalonia.Themes.Default/TimePicker.xaml b/src/Avalonia.Themes.Default/TimePicker.xaml
index c76f900cfe..a58fd62a99 100644
--- a/src/Avalonia.Themes.Default/TimePicker.xaml
+++ b/src/Avalonia.Themes.Default/TimePicker.xaml
@@ -58,6 +58,7 @@
                   Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}"
                   IsEnabled="{TemplateBinding IsEnabled}"
                   MinWidth="{DynamicResource TimePickerThemeMinWidth}"
                   MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
@@ -71,6 +72,7 @@
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 Background="{TemplateBinding Background}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{TemplateBinding CornerRadius}"
                                 Content="{TemplateBinding Content}"
                                 TextBlock.Foreground="{TemplateBinding Foreground}"
                                 HorizontalContentAlignment="Stretch"
@@ -178,6 +180,7 @@
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
                 Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
                 MaxHeight="398">
           <Grid Name="ContentPanel" RowDefinitions="*,Auto">
diff --git a/src/Avalonia.Themes.Default/ToggleButton.xaml b/src/Avalonia.Themes.Default/ToggleButton.xaml
index 9e05c38eef..ffebd4f63d 100644
--- a/src/Avalonia.Themes.Default/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Default/ToggleButton.xaml
@@ -13,6 +13,7 @@
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding Content}"
                           Padding="{TemplateBinding Padding}"
@@ -35,4 +36,4 @@
   <Style Selector="ToggleButton:disabled">
     <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
   </Style>
-</Styles>
\ No newline at end of file
+</Styles>
diff --git a/src/Avalonia.Themes.Default/ToolTip.xaml b/src/Avalonia.Themes.Default/ToolTip.xaml
index 1fc0202dd3..35c1dceb8d 100644
--- a/src/Avalonia.Themes.Default/ToolTip.xaml
+++ b/src/Avalonia.Themes.Default/ToolTip.xaml
@@ -9,9 +9,10 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
                         ContentTemplate="{TemplateBinding ContentTemplate}"
                         Content="{TemplateBinding Content}" 
                         Padding="{TemplateBinding Padding}"/>
     </ControlTemplate>
   </Setter>
-</Style>
\ No newline at end of file
+</Style>
diff --git a/src/Avalonia.Themes.Default/TreeView.xaml b/src/Avalonia.Themes.Default/TreeView.xaml
index 026bed5899..990d5d0823 100644
--- a/src/Avalonia.Themes.Default/TreeView.xaml
+++ b/src/Avalonia.Themes.Default/TreeView.xaml
@@ -8,7 +8,8 @@
   <Setter Property="Template">
     <ControlTemplate>
       <Border BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}">
+              BorderThickness="{TemplateBinding BorderThickness}"
+              CornerRadius="{TemplateBinding CornerRadius}">
         <ScrollViewer Background="{TemplateBinding Background}"
                       HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                       VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
diff --git a/src/Avalonia.Themes.Default/TreeViewItem.xaml b/src/Avalonia.Themes.Default/TreeViewItem.xaml
index a3f8d8b7f7..1996756001 100644
--- a/src/Avalonia.Themes.Default/TreeViewItem.xaml
+++ b/src/Avalonia.Themes.Default/TreeViewItem.xaml
@@ -15,6 +15,7 @@
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
                             TemplatedControl.IsTemplateFocusTarget="True">
                         <Grid Name="PART_Header"
                               ColumnDefinitions="16, *"
diff --git a/src/Avalonia.Themes.Default/UserControl.xaml b/src/Avalonia.Themes.Default/UserControl.xaml
index f4d0c21367..d6028daff8 100644
--- a/src/Avalonia.Themes.Default/UserControl.xaml
+++ b/src/Avalonia.Themes.Default/UserControl.xaml
@@ -5,6 +5,7 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
                         ContentTemplate="{TemplateBinding ContentTemplate}"
                         Content="{TemplateBinding Content}"
                         Padding="{TemplateBinding Padding}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
index 532826c500..58295d024f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
@@ -22,7 +22,8 @@
     <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
     <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />    
+    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
     <Setter Property="MaxDropDownHeight" Value="{DynamicResource AutoCompleteListMaxHeight}" />
@@ -36,6 +37,7 @@
                    Background="{TemplateBinding Background}"
                    BorderBrush="{TemplateBinding BorderBrush}"
                    BorderThickness="{TemplateBinding BorderThickness}"
+                   CornerRadius="{TemplateBinding CornerRadius}"
                    FontSize="{TemplateBinding FontSize}"
                    FontFamily="{TemplateBinding FontFamily}"
                    FontWeight="{TemplateBinding FontWeight}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/Button.xaml b/src/Avalonia.Themes.Fluent/Controls/Button.xaml
index 597f5d00ec..53d53ef127 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Button.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Button.xaml
@@ -16,6 +16,7 @@
     <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThemeThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />    
@@ -29,6 +30,7 @@
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Padding="{TemplateBinding Padding}"
@@ -93,8 +95,4 @@
     <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushDisabled}" />
     <Setter Property="TextBlock.Foreground" Value="{DynamicResource AccentButtonForegroundDisabled}" />
   </Style>
-  
-  <Style Selector="Button /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-  </Style>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
index 12b4845522..d228c37912 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
@@ -58,6 +58,7 @@
     <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
     <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />    
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
@@ -69,7 +70,7 @@
           <Border Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{DynamicResource ControlCornerRadius}"
+                  CornerRadius="{TemplateBinding CornerRadius}"
                   MinHeight="{TemplateBinding MinHeight}">
             <Grid ColumnDefinitions="Auto,*,Auto">
               <ContentPresenter Name="PART_ContentPresenter"
diff --git a/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml b/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml
index 6ae334dbae..43e4a1fcea 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml
@@ -5,7 +5,12 @@
 // All other rights reserved.
 -->
 
-<Styles xmlns="https://github.com/avaloniaui">  
+<Styles xmlns="https://github.com/avaloniaui">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <Calendar />
+    </Border>
+  </Design.PreviewWith>
   <Style Selector="Calendar">
     <Setter Property="Foreground" Value="{DynamicResource CalendarViewForeground}" />
     <Setter Property="Background" Value="{DynamicResource CalendarViewBackground}" />
@@ -23,7 +28,8 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                        HeaderBackground="{TemplateBinding HeaderBackground}"/>
+                        HeaderBackground="{TemplateBinding HeaderBackground}"
+                        CornerRadius="{TemplateBinding CornerRadius}"/>
 
         </StackPanel>
       </ControlTemplate>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
index 9b61fc4f77..995cca2b82 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
@@ -26,6 +26,7 @@
     <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerForeground}"/>
     <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrush}"/>
     <Setter Property="BorderThickness" Value="{DynamicResource CalendarDatePickerBorderThemeThickness}"/>
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="Padding" Value="4"/>
@@ -102,6 +103,7 @@
                    Background="{TemplateBinding Background}" 
                    BorderBrush="{TemplateBinding BorderBrush}" 
                    BorderThickness="{TemplateBinding BorderThickness}" 
+                   CornerRadius="{TemplateBinding CornerRadius}"
                    Padding="{TemplateBinding Padding}"
                    Watermark="{TemplateBinding Watermark}"
                    UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
index df17da84dc..5bf3ac11af 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
@@ -7,7 +7,13 @@
 
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <Calendar />
+    </Border>
+  </Design.PreviewWith>
   <Style Selector="CalendarItem">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="DayTitleTemplate">
       <Template>
         <TextBlock Text="{Binding}"
@@ -21,7 +27,7 @@
         <Border BorderThickness="{TemplateBinding BorderThickness}"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
-                CornerRadius="{DynamicResource ControlCornerRadius}">
+                CornerRadius="{TemplateBinding CornerRadius}">
           <Border.Styles>
             <Style Selector="Button.CalendarHeader">
               <Setter Property="HorizontalAlignment" Value="Stretch" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml b/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
index 955a49a974..baba0649aa 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
@@ -3,7 +3,8 @@
     <ControlTemplate>
       <Border Background="{TemplateBinding Background}"
               BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}">
+              BorderThickness="{TemplateBinding BorderThickness}"
+              CornerRadius="{TemplateBinding CornerRadius}">
         <CarouselPresenter IsVirtualized="{TemplateBinding IsVirtualized}"
                            Items="{TemplateBinding Items}"
                            ItemsPanel="{TemplateBinding ItemsPanel}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
index 9261a82168..7969cec947 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
@@ -11,6 +11,7 @@
     <Setter Property="HorizontalContentAlignment" Value="Left" />
     <Setter Property="VerticalContentAlignment" Value="Center" />    
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="MinHeight" Value="32" />
     <!--<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
     <Setter Property="FocusVisualMargin" Value="-7,-3,-7,-3" />-->
@@ -21,11 +22,13 @@
                   Grid.ColumnSpan="2"
                   Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}" />
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}" />
 
           <Grid VerticalAlignment="Top" Height="32">
             <Border x:Name="NormalRectangle"
                 BorderThickness="{DynamicResource CheckBoxBorderThemeThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
                 UseLayoutRounding="False"
                 Height="20"
                 Width="20" />
@@ -49,14 +52,6 @@
       </ControlTemplate>
     </Setter>
   </Style>
-  
-  <Style Selector="CheckBox /template/ Border#PART_Border">
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-  </Style>
-
-  <Style Selector="CheckBox /template/ Border#NormalRectangle">
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-  </Style>
 
   <!-- Unchecked Normal State -->
   <Style Selector="CheckBox">
diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
index 60420f2f44..f07fc6f2e0 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
@@ -34,6 +34,7 @@
     <Setter Property="Background" Value="{DynamicResource ComboBoxBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ComboBoxBorderThemeThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
     <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -62,6 +63,7 @@
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
                     MinWidth="{DynamicResource ComboBoxThemeMinWidth}" />
 
             <Border x:Name="HighlightBackground"
@@ -70,7 +72,8 @@
                     Grid.ColumnSpan="2"
                     Background="{DynamicResource ComboBoxBackgroundUnfocused}"
                     BorderBrush="{DynamicResource ComboBoxBackgroundBorderBrushUnfocused}"
-                    BorderThickness="{TemplateBinding BorderThickness}" />
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}" />
             <TextBlock x:Name="PlaceholderTextBlock"
                        Grid.Row="1"
                        Grid.Column="0"
@@ -227,14 +230,6 @@
     <Setter Property="Fill" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocusedPressed}" />
   </Style>
   
-  <Style Selector="ComboBox /template/ Border#Background">
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-  </Style>
-  
-  <Style Selector="ComboBox /template/ Border#HighlightBackground">
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-  </Style>
-  
   <!-- Error State -->
   <Style Selector="ComboBox:error /template/ Border#Background">
     <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
index 66ccea99b5..a958d785fa 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
@@ -29,6 +29,7 @@
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding Content}"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml b/src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml
index d76eecee84..d32bc399b6 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml
@@ -5,6 +5,7 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
                         ContentTemplate="{TemplateBinding ContentTemplate}"
                         Content="{TemplateBinding Content}"
                         Padding="{TemplateBinding Padding}"
@@ -12,4 +13,4 @@
                         HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
     </ControlTemplate>
   </Setter>
-</Style>
\ No newline at end of file
+</Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml b/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
index 5110d70a80..df800b4a06 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
@@ -39,6 +39,7 @@
   <Setter Property="Background" Value="{DynamicResource MenuFlyoutPresenterBackground}" />
   <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
   <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
+  <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
   <Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
   <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
   <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
@@ -55,7 +56,7 @@
               MaxWidth="{TemplateBinding MaxWidth}"
               MinHeight="{TemplateBinding MinHeight}"
               HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-              CornerRadius="{DynamicResource OverlayCornerRadius}">
+              CornerRadius="{TemplateBinding CornerRadius}">
         <ScrollViewer Classes="menuscroller">
           <ItemsPresenter Name="PART_ItemsPresenter"
                           Items="{TemplateBinding Items}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
index 53c5d4eda6..d2fab37206 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
@@ -48,6 +48,7 @@
                             Padding="{TemplateBinding Padding}"
                             Background="{TemplateBinding Background}"
                             BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
                             Content="{TemplateBinding Content}"
                             ContentTemplate="{TemplateBinding ContentTemplate}" />
         </DockPanel>
@@ -88,6 +89,7 @@
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
                             Content="{TemplateBinding Content}"
                             ContentTemplate="{TemplateBinding ContentTemplate}" />
         </DockPanel>
diff --git a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
index 032fdd9ae4..3e4471cada 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
@@ -8,6 +8,12 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:sys="clr-namespace:System;assembly=netstandard">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <DatePicker CornerRadius="10" />
+    </Border>
+  </Design.PreviewWith>
+  
   <Styles.Resources>
     <Thickness x:Key="DatePickerTopHeaderMargin">0,0,0,4</Thickness>
     <x:Double x:Key="DatePickerFlyoutPresenterHighlightHeight">40</x:Double>
@@ -50,6 +56,7 @@
     <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackground}" />
     <Setter Property="HorizontalContentAlignment" Value="Center"/>
     <Setter Property="VerticalContentAlignment" Value="Center"/>
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Template">
       <ControlTemplate>
         <!-- 
@@ -67,7 +74,7 @@
                   Padding="{TemplateBinding Padding}"
                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                  CornerRadius="{DynamicResource ControlCornerRadius}"/>
+                  CornerRadius="{TemplateBinding CornerRadius}"/>
         </Border>
       </ControlTemplate>
     </Setter>
@@ -121,6 +128,7 @@
     <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackground}"/>
     <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrush}"/>
     <Setter Property="BorderThickness" Value="1"/>
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="Template">
@@ -140,6 +148,7 @@
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
                     IsEnabled="{TemplateBinding IsEnabled}"
                     MinWidth="{DynamicResource DatePickerThemeMinWidth}"
                     MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
@@ -158,7 +167,7 @@
                                     TextBlock.Foreground="{TemplateBinding Foreground}"
                                     HorizontalContentAlignment="Stretch"
                                     VerticalContentAlignment="Stretch"
-                                    CornerRadius="{DynamicResource ControlCornerRadius}"/>
+                                    CornerRadius="{TemplateBinding CornerRadius}"/>
                 </ControlTemplate>
               </Button.Template>
               <Grid Name="ButtonContentGrid" ColumnDefinitions="78*,Auto,132*,Auto,78*">
@@ -246,13 +255,14 @@
     <Setter Property="Background" Value="{DynamicResource DatePickerFlyoutPresenterBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource DatePickerFlyoutPresenterBorderBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Name="Background" Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
                 Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
-                MaxHeight="398" CornerRadius="{DynamicResource OverlayCornerRadius}">
+                MaxHeight="398" CornerRadius="{TemplateBinding CornerRadius}">
           <Grid Name="ContentRoot" RowDefinitions="*,Auto">
             <Grid Name="PickerContainer">
               <!--Column Definitions set in code, ignore here-->
diff --git a/src/Avalonia.Themes.Fluent/Controls/Expander.xaml b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
index 3f70939953..d5d44e1270 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
@@ -1,23 +1,23 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
-      <StackPanel Orientation="Vertical" Spacing="20">
-        <Expander ExpandDirection="Up" Header="Expand Up">
+      <StackPanel Orientation="Vertical" Spacing="20" Width="350">
+        <Expander ExpandDirection="Up" Header="Expand Up" CornerRadius="25">
           <StackPanel>
             <TextBlock>Expanded content</TextBlock>
           </StackPanel>
         </Expander>
-        <Expander ExpandDirection="Down" Header="Expand Down">
+        <Expander ExpandDirection="Down" Header="Expand Down" CornerRadius="25">
           <StackPanel>
             <TextBlock>Expanded content</TextBlock>
           </StackPanel>
         </Expander>
-        <Expander ExpandDirection="Left" Header="Expand Left">
+        <Expander ExpandDirection="Left" Header="Expand Left" CornerRadius="25">
           <StackPanel>
             <TextBlock>Expanded content</TextBlock>
           </StackPanel>
         </Expander>
-        <Expander ExpandDirection="Right" Header="Expand Right">
+        <Expander ExpandDirection="Right" Header="Expand Right" CornerRadius="25">
           <StackPanel>
             <TextBlock>Expanded content</TextBlock>
           </StackPanel>
@@ -51,6 +51,7 @@
     <Setter Property="Background" Value="{DynamicResource ExpanderBackground}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ExpanderBorderThickness}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ExpanderBorderBrush}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Padding" Value="{DynamicResource ExpanderHeaderPadding}" />
     <Setter Property="HorizontalAlignment" Value="Stretch" />
     <Setter Property="HorizontalContentAlignment" Value="Left" />
@@ -140,31 +141,31 @@
   </Style>
 
   <Style Selector="Expander:not(:expanded) /template/ ToggleButton#ExpanderHeader /template/ Border#ToggleButtonBackground">
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius}" />
   </Style>
   <Style Selector="Expander:expanded:up /template/ ToggleButton#ExpanderHeader /template/ Border#ToggleButtonBackground">
-    <Setter Property="CornerRadius" Value="{Binding Source={StaticResource ControlCornerRadius}, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
+    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
   </Style>
   <Style Selector="Expander:expanded:up /template/ Border#ExpanderContent">
-    <Setter Property="CornerRadius" Value="{Binding Source={StaticResource ControlCornerRadius}, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
   </Style>
   <Style Selector="Expander:expanded:down /template/ ToggleButton#ExpanderHeader /template/ Border#ToggleButtonBackground">
-    <Setter Property="CornerRadius" Value="{Binding Source={StaticResource ControlCornerRadius}, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
   </Style>
   <Style Selector="Expander:expanded:down /template/ Border#ExpanderContent">
-    <Setter Property="CornerRadius" Value="{Binding Source={StaticResource ControlCornerRadius}, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
+    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
   </Style>
   <Style Selector="Expander:expanded:left /template/ ToggleButton#ExpanderHeader /template/ Border#ToggleButtonBackground">
-    <Setter Property="CornerRadius" Value="{Binding Source={StaticResource ControlCornerRadius}, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
+    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
   </Style>
   <Style Selector="Expander:expanded:left /template/ Border#ExpanderContent">
-    <Setter Property="CornerRadius" Value="{Binding Source={StaticResource ControlCornerRadius}, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
   </Style>
   <Style Selector="Expander:expanded:right /template/ ToggleButton#ExpanderHeader /template/ Border#ToggleButtonBackground">
-    <Setter Property="CornerRadius" Value="{Binding Source={StaticResource ControlCornerRadius}, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
   </Style>
   <Style Selector="Expander:expanded:right /template/ Border#ExpanderContent">
-    <Setter Property="CornerRadius" Value="{Binding Source={StaticResource ControlCornerRadius}, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
+    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
   </Style>
 
   <Style Selector="Expander:left /template/ ToggleButton#ExpanderHeader">
diff --git a/src/Avalonia.Themes.Fluent/Controls/GridSplitter.xaml b/src/Avalonia.Themes.Fluent/Controls/GridSplitter.xaml
index d68d74d884..e3a7b04f33 100644
--- a/src/Avalonia.Themes.Fluent/Controls/GridSplitter.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/GridSplitter.xaml
@@ -15,6 +15,7 @@
         <Border 
           BorderBrush="{TemplateBinding BorderBrush}"
           BorderThickness="{TemplateBinding BorderThickness}"
+          CornerRadius="{TemplateBinding CornerRadius}"
           Background="{TemplateBinding Background}"/>
       </ControlTemplate>
     </Setter>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml b/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
index 8bb0fc297c..19d13b6399 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
@@ -4,6 +4,7 @@
       <Border Background="{TemplateBinding Background}"
               BorderBrush="{TemplateBinding BorderBrush}"
               BorderThickness="{TemplateBinding BorderThickness}"
+              CornerRadius="{TemplateBinding CornerRadius}"
               Padding="{TemplateBinding Padding}">
         <ItemsPresenter Name="PART_ItemsPresenter"
                         Items="{TemplateBinding Items}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/Label.xaml b/src/Avalonia.Themes.Fluent/Controls/Label.xaml
index d93381aa69..d41e4e2166 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Label.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Label.xaml
@@ -5,7 +5,8 @@
       <ContentPresenter Name="PART_ContentPresenter"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
+                        BorderThickness="{TemplateBinding BorderThickness}"                        
+                        CornerRadius="{TemplateBinding CornerRadius}"
                         ContentTemplate="{TemplateBinding ContentTemplate}"
                         Content="{TemplateBinding Content}"
                         Padding="{TemplateBinding Padding}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
index 9e8db19feb..47704c12bd 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
@@ -19,10 +19,12 @@
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />    
     <Setter Property="Template">
       <ControlTemplate>
-        <Border Name="border" BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}">
+        <Border Name="border"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
           <ScrollViewer Name="PART_ScrollViewer"
-                        Background="{TemplateBinding Background}"
                         HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                         VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
                         AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
diff --git a/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
index 627ffa2b19..64f52f53db 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
@@ -25,6 +25,7 @@
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding Content}"
                           Padding="{TemplateBinding Padding}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/Menu.xaml b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
index 16b1d5e239..4eb724a926 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
@@ -21,6 +21,7 @@
       <Border Background="{TemplateBinding Background}"
               BorderBrush="{TemplateBinding BorderBrush}"
               BorderThickness="{TemplateBinding BorderThickness}"
+              CornerRadius="{TemplateBinding CornerRadius}"
               HorizontalAlignment="Stretch"
               Padding="{TemplateBinding Padding}">
         <ItemsPresenter Name="PART_ItemsPresenter"
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
index f199f80fed..3903096933 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
@@ -61,7 +61,8 @@
                   Padding="{TemplateBinding Padding}"
                   Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}">
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
             <Grid>
               <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"
@@ -143,7 +144,8 @@
         <Border Name="PART_LayoutRoot"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}">
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
           <Panel>
             <ContentPresenter Name="PART_HeaderPresenter"
                               Content="{TemplateBinding Header}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml b/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
index 5a0fa32657..c06b501f82 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
@@ -12,7 +12,8 @@
     <Setter Property="Foreground" Value="White"/>
     <Setter Property="RenderTransformOrigin" Value="50%,75%"/>
     <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Background" Value="{DynamicResource NotificationCardBackgroundBrush}" />    
+    <Setter Property="Background" Value="{DynamicResource NotificationCardBackgroundBrush}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Template">
       <ControlTemplate>
         <LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True">
@@ -20,7 +21,8 @@
             <Border Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{DynamicResource ControlCornerRadius}" ClipToBounds="True">
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    ClipToBounds="True">
               <DockPanel>
                 <Panel x:Name="PART_HeaderBar" Height="4" DockPanel.Dock="Top" />
                 <ContentControl Name="PART_Content" Content="{TemplateBinding Content}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
index 288b3ccee6..3a9608b85b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
@@ -29,12 +29,14 @@
     <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />    
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Template">
       <ControlTemplate>
         <ButtonSpinner Name="PART_Spinner"
                        Background="{TemplateBinding Background}"
                        BorderThickness="{TemplateBinding BorderThickness}"
                        BorderBrush="{TemplateBinding BorderBrush}"
+                       CornerRadius="{TemplateBinding CornerRadius}"
                        Padding="0"
                        HorizontalContentAlignment="Stretch"
                        VerticalContentAlignment="Stretch"
diff --git a/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
index 0dfd3e414a..bd5c4d4691 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
@@ -14,12 +14,13 @@
     <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAccentBrush}" />
     <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ProgressBarBorderThemeThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="BorderBrush" Value="{DynamicResource SystemControlHighlightTransparentBrush}" />
     <Setter Property="MinHeight" Value="{DynamicResource ProgressBarThemeMinHeight}" />
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Border x:Name="ProgressBarRoot" ClipToBounds="True" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource ControlCornerRadius}">          
+        <Border x:Name="ProgressBarRoot" ClipToBounds="True" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}">          
             <Panel>
               <Panel x:Name="DeterminateRoot">
                 <Border CornerRadius="{DynamicResource ControlCornerRadius}" x:Name="PART_Indicator" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Foreground}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml b/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
index 35274b9cf3..8eae27e9a2 100644
--- a/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
@@ -2,7 +2,7 @@
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="10">
-        <RadioButton Content="Option 1" />
+        <RadioButton Content="Option 1" Background="Green" />
         <RadioButton Content="Option 2" />
         <RadioButton IsEnabled="False" Content="Option 3" />
         <RadioButton Content="Option 2" />
@@ -13,6 +13,7 @@
     <Setter Property="Background" Value="{DynamicResource RadioButtonBackground}" />
     <Setter Property="Foreground" Value="{DynamicResource RadioButtonForeground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrush}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Padding" Value="8,0,0,0" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
@@ -24,7 +25,8 @@
         <Border Name="RootBorder"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}">
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
           <Grid ColumnDefinitions="20,*">
             <Grid VerticalAlignment="Top"
               Height="32">
@@ -75,11 +77,6 @@
     <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStroke}" />
     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFill}" />
   </Style>
-  
-  <Style Selector="RadioButton /template/ Border#RootBorder">
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-  </Style>
-
 
   <!-- PointerOver State -->
   <Style Selector="RadioButton:pointerover /template/ ContentPresenter#PART_ContentPresenter">
diff --git a/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml b/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
index 70a6b8a2ee..6f96a1eb42 100644
--- a/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
@@ -15,6 +15,7 @@
     <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForeground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThemeThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />    
@@ -28,6 +29,7 @@
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Padding="{TemplateBinding Padding}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/Separator.xaml b/src/Avalonia.Themes.Fluent/Controls/Separator.xaml
index dc968fe86c..5d95ccc404 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Separator.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Separator.xaml
@@ -10,6 +10,7 @@
                 VerticalAlignment="{TemplateBinding VerticalAlignment}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
                 Background="{TemplateBinding Background}"/>
       </ControlTemplate>
     </Setter>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
index 33f0a76423..5ee2dc527f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
@@ -43,7 +43,7 @@
     <Setter Property="Template">
       <ControlTemplate>
         <DataValidationErrors>
-          <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{DynamicResource ControlCornerRadius}">
+          <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{TemplateBinding CornerRadius}">
             <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
               <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}"
               Margin="{DynamicResource SliderTopHeaderMargin}" />
@@ -105,7 +105,7 @@
     <Setter Property="Template">
       <ControlTemplate>
         <DataValidationErrors>
-          <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{DynamicResource ControlCornerRadius}">
+          <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{TemplateBinding CornerRadius}">
             <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
               <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}"
               Margin="{DynamicResource SliderTopHeaderMargin}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml b/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml
index 120b2986c3..322f6ce89e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml
@@ -29,9 +29,9 @@
     <Setter Property="Background" Value="{DynamicResource TabControlBackground}" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Border Margin="{TemplateBinding Margin}"
-                BorderBrush="{TemplateBinding BorderBrush}"
+        <Border BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
                 Background="{TemplateBinding Background}"
                 HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                 VerticalAlignment="{TemplateBinding VerticalAlignment}">
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
index 508473796c..f821bb07e6 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
@@ -28,6 +28,7 @@
         <Border Name="PART_LayoutRoot"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
                 Padding="{TemplateBinding Padding}">
           <Panel>
             <ContentPresenter Name="PART_ContentPresenter"
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml b/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml
index 8b3c0a8310..681ac48850 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml
@@ -11,10 +11,16 @@
   <Style Selector="TabStrip">
     <Setter Property="Template">
       <ControlTemplate>
-        <ItemsPresenter Name="PART_ItemsPresenter"
-                        Items="{TemplateBinding Items}"
-                        ItemsPanel="{TemplateBinding ItemsPanel}"
-                        ItemTemplate="{TemplateBinding ItemTemplate}" />
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
+                Padding="{TemplateBinding Padding}">
+          <ItemsPresenter Name="PART_ItemsPresenter"
+                          Items="{TemplateBinding Items}"
+                          ItemsPanel="{TemplateBinding ItemsPanel}"
+                          ItemTemplate="{TemplateBinding ItemTemplate}" />
+        </Border>
       </ControlTemplate>
     </Setter>
     <Setter Property="ItemsPanel">
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
index 69940eff25..f9adaf715b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
@@ -27,6 +27,7 @@
         <Border Name="PART_LayoutRoot"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
                 Padding="{TemplateBinding Padding}">
           <Panel>
             <ContentPresenter Name="PART_ContentPresenter"
diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
index 855143f592..982a5228d9 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -15,7 +15,7 @@
     <StreamGeometry x:Key="PasswordBoxRevealButtonData">m10.051 7.0032c2.215 0 4.0105 1.7901 4.0105 3.9984s-1.7956 3.9984-4.0105 3.9984c-2.215 0-4.0105-1.7901-4.0105-3.9984s1.7956-3.9984 4.0105-3.9984zm0 1.4994c-1.3844 0-2.5066 1.1188-2.5066 2.499s1.1222 2.499 2.5066 2.499 2.5066-1.1188 2.5066-2.499-1.1222-2.499-2.5066-2.499zm0-5.0026c4.6257 0 8.6188 3.1487 9.7267 7.5613 0.10085 0.40165-0.14399 0.80877-0.54686 0.90931-0.40288 0.10054-0.81122-0.14355-0.91208-0.54521-0.94136-3.7492-4.3361-6.4261-8.2678-6.4261-3.9334 0-7.3292 2.6792-8.2689 6.4306-0.10063 0.40171-0.50884 0.64603-0.91177 0.54571s-0.648-0.5073-0.54737-0.90901c1.106-4.4152 5.1003-7.5667 9.728-7.5667z</StreamGeometry>
     <StreamGeometry x:Key="PasswordBoxHideButtonData">m0.21967 0.21965c-0.26627 0.26627-0.29047 0.68293-0.07262 0.97654l0.07262 0.08412 4.0346 4.0346c-1.922 1.3495-3.3585 3.365-3.9554 5.7495-0.10058 0.4018 0.14362 0.8091 0.54543 0.9097 0.40182 0.1005 0.80909-0.1436 0.90968-0.5455 0.52947-2.1151 1.8371-3.8891 3.5802-5.0341l1.8096 1.8098c-0.70751 0.7215-1.1438 1.71-1.1438 2.8003 0 2.2092 1.7909 4 4 4 1.0904 0 2.0788-0.4363 2.8004-1.1438l5.9193 5.9195c0.2929 0.2929 0.7677 0.2929 1.0606 0 0.2663-0.2662 0.2905-0.6829 0.0726-0.9765l-0.0726-0.0841-6.1135-6.1142 0.0012-0.0015-1.2001-1.1979-2.8699-2.8693 2e-3 -8e-4 -2.8812-2.8782 0.0012-0.0018-1.1333-1.1305-4.3064-4.3058c-0.29289-0.29289-0.76777-0.29289-1.0607 0zm7.9844 9.0458 3.5351 3.5351c-0.45 0.4358-1.0633 0.704-1.7392 0.704-1.3807 0-2.5-1.1193-2.5-2.5 0-0.6759 0.26824-1.2892 0.7041-1.7391zm1.7959-5.7655c-1.0003 0-1.9709 0.14807-2.8889 0.425l1.237 1.2362c0.5358-0.10587 1.0883-0.16119 1.6519-0.16119 3.9231 0 7.3099 2.6803 8.2471 6.4332 0.1004 0.4018 0.5075 0.6462 0.9094 0.5459 0.4019-0.1004 0.6463-0.5075 0.5459-0.9094-1.103-4.417-5.0869-7.5697-9.7024-7.5697zm0.1947 3.5093 3.8013 3.8007c-0.1018-2.0569-1.7488-3.7024-3.8013-3.8007z</StreamGeometry>
 
-    <MenuFlyout x:Key="DefaultTextBoxContextFlyout">
+    <MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
       <MenuItem x:Name="TextBoxContextFlyoutCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
       <MenuItem x:Name="TextBoxContextFlyoutCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
       <MenuItem x:Name="TextBoxContextFlyoutPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
@@ -35,6 +35,7 @@
     <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
     <Setter Property="SelectionBrush" Value="{DynamicResource TextControlSelectionHighlightColor}" />
     <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />    
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
     <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
@@ -50,6 +51,7 @@
               Background="{TemplateBinding Background}"
               BorderBrush="{TemplateBinding BorderBrush}"
               BorderThickness="{TemplateBinding BorderThickness}"
+              CornerRadius="{TemplateBinding CornerRadius}"
               MinWidth="{TemplateBinding MinWidth}"
               MinHeight="{TemplateBinding MinHeight}">
             </Border>
@@ -76,9 +78,7 @@
                                 IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                        <!-- TODO eliminate this margin... text layout issue? -->
                         <TextPresenter Name="PART_TextPresenter"
-                                      Margin="0 1 0 0"
                                       Text="{TemplateBinding Text, Mode=TwoWay}"
                                       CaretIndex="{TemplateBinding CaretIndex}"
                                       SelectionStart="{TemplateBinding SelectionStart}"
@@ -151,10 +151,6 @@
     <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
   </Style>
 
-  <Style Selector="TextBox /template/ Border#PART_BorderElement">
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-  </Style>
-
   <Style Selector="TextBox /template/ DockPanel#PART_InnerDockPanel">
     <Setter Property="Cursor" Value="IBeam" />
   </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
index 1c52c6272c..3320fc9a41 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
@@ -37,6 +37,7 @@
     <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackground}"/>
     <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrush}"/>
     <Setter Property="BorderThickness" Value="{DynamicResource TimePickerBorderThemeThickness}"/>
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="Template">
@@ -59,6 +60,7 @@
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
                     IsEnabled="{TemplateBinding IsEnabled}"
                     MinWidth="{DynamicResource TimePickerThemeMinWidth}"
                     MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
@@ -72,11 +74,11 @@
                                   BorderBrush="{TemplateBinding BorderBrush}"
                                   Background="{TemplateBinding Background}"
                                   BorderThickness="{TemplateBinding BorderThickness}"
+                                  CornerRadius="{TemplateBinding CornerRadius}"
                                   Content="{TemplateBinding Content}"
                                   TextBlock.Foreground="{TemplateBinding Foreground}"
                                   HorizontalContentAlignment="Stretch"
-                                  VerticalContentAlignment="Stretch"
-                                  CornerRadius="{DynamicResource ControlCornerRadius}" />
+                                  VerticalContentAlignment="Stretch" />
                 </ControlTemplate>
               </Button.Template>
 
@@ -176,13 +178,14 @@
     <Setter Property="Background" Value="{DynamicResource TimePickerFlyoutPresenterBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TimePickerFlyoutPresenterBorderBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Name="Background"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{DynamicResource OverlayCornerRadius}"
+                CornerRadius="{TemplateBinding CornerRadius}"
                 Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
                 MaxHeight="398">
           <Grid Name="ContentPanel" RowDefinitions="*,Auto">
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
index dd8e51e4e5..b1d07059b8 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
@@ -18,6 +18,7 @@
     <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForeground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ToggleButtonBorderThemeThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />    
@@ -29,6 +30,7 @@
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Padding="{TemplateBinding Padding}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml b/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
index f7a1ebbc6b..debdfb2772 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
@@ -49,6 +49,7 @@
     <Setter Property="FontSize" Value="{DynamicResource ToolTipContentThemeFontSize}" />
     <Setter Property="Padding" Value="{DynamicResource ToolTipBorderThemePadding}" />
     <Setter Property="MaxWidth" Value="{DynamicResource ToolTipContentMaxWidth}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
     <Setter Property="Transitions">
       <Transitions>
         <DoubleTransition Property="Opacity" Duration="0:0:0.15" />
@@ -61,7 +62,7 @@
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 Padding="{TemplateBinding Padding}"
-                CornerRadius="{DynamicResource OverlayCornerRadius}">
+                CornerRadius="{TemplateBinding CornerRadius}">
           <ContentPresenter Name="PART_ContentPresenter"
                             MaxWidth="{TemplateBinding MaxWidth}"
                             Content="{TemplateBinding Content}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml b/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml
index 15325de988..0164e5688c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml
@@ -9,7 +9,8 @@
   <Setter Property="Template">
     <ControlTemplate>
       <Border BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}">
+              BorderThickness="{TemplateBinding BorderThickness}"
+              CornerRadius="{TemplateBinding CornerRadius}">
         <ScrollViewer Background="{TemplateBinding Background}"
                       HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                       VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
index a938394b56..e66392113f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
@@ -70,6 +70,7 @@
                   Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}"
                   MinHeight="{TemplateBinding MinHeight}"
                   TemplatedControl.IsTemplateFocusTarget="True">
             <Grid Name="PART_Header"
diff --git a/src/Avalonia.Themes.Fluent/Controls/UserControl.xaml b/src/Avalonia.Themes.Fluent/Controls/UserControl.xaml
index f4d0c21367..d6028daff8 100644
--- a/src/Avalonia.Themes.Fluent/Controls/UserControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/UserControl.xaml
@@ -5,6 +5,7 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
                         ContentTemplate="{TemplateBinding ContentTemplate}"
                         Content="{TemplateBinding Content}"
                         Padding="{TemplateBinding Padding}"
diff --git a/src/Avalonia.Visuals/Animation/Animators/BaseBrushAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/BaseBrushAnimator.cs
index 508891fd72..ba7a3868c7 100644
--- a/src/Avalonia.Visuals/Animation/Animators/BaseBrushAnimator.cs
+++ b/src/Avalonia.Visuals/Animation/Animators/BaseBrushAnimator.cs
@@ -1,9 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.Reactive.Disposables;
+using System.Diagnostics.CodeAnalysis;
+
 using Avalonia.Logging;
 using Avalonia.Media;
 
+#nullable enable
+
 namespace Avalonia.Animation.Animators
 {
     /// <summary>
@@ -12,10 +15,8 @@ namespace Avalonia.Animation.Animators
     /// redirect them to the properly registered
     /// animators in this class.
     /// </summary>
-    public class BaseBrushAnimator : Animator<IBrush>
+    public class BaseBrushAnimator : Animator<IBrush?>
     {
-        private IAnimator _targetAnimator;
-
         private static readonly List<(Func<Type, bool> Match, Type AnimatorType)> _brushAnimators =
             new List<(Func<Type, bool> Match, Type AnimatorType)>();
 
@@ -31,7 +32,7 @@ namespace Avalonia.Animation.Animators
         /// The type of the animator to instantiate.
         /// </typeparam>
         public static void RegisterBrushAnimator<TAnimator>(Func<Type, bool> condition)
-            where TAnimator : IAnimator
+            where TAnimator : IAnimator, new()
         {
             _brushAnimators.Insert(0, (condition, typeof(TAnimator)));
         }
@@ -40,30 +41,127 @@ namespace Avalonia.Animation.Animators
         public override IDisposable Apply(Animation animation, Animatable control, IClock clock,
             IObservable<bool> match, Action onComplete)
         {
-            foreach (var valueType in _brushAnimators)
+            if (TryCreateCustomRegisteredAnimator(out var animator)
+                || TryCreateGradientAnimator(out animator)
+                || TryCreateSolidColorBrushAnimator(out animator))
             {
-                if (!valueType.Match(this[0].Value.GetType())) continue;
+                return animator.Apply(animation, control, clock, match, onComplete);
+            }
+
+            Logger.TryGet(LogEventLevel.Error, LogArea.Animations)?.Log(
+                this,
+                "The animation's keyframe value types set is not supported.");
+
+            return base.Apply(animation, control, clock, match, onComplete);
+        }
 
-                _targetAnimator = (IAnimator)Activator.CreateInstance(valueType.AnimatorType);
+        /// <summary>
+        /// Fallback implementation of <see cref="IBrush"/> animation.
+        /// </summary>
+        public override IBrush? Interpolate(double progress, IBrush? oldValue, IBrush? newValue) => progress >= 0.5 ? newValue : oldValue;
 
-                foreach (var keyframe in this)
+        private bool TryCreateGradientAnimator([NotNullWhen(true)] out IAnimator? animator)
+        {
+            IGradientBrush? firstGradient = null;
+            foreach (var keyframe in this)
+            {
+                if (keyframe.Value is IGradientBrush gradientBrush)
                 {
-                    _targetAnimator.Add(keyframe);
+                    firstGradient = gradientBrush;
+                    break;
                 }
+            }
 
-                _targetAnimator.Property = this.Property;
-                
-               return _targetAnimator.Apply(animation, control, clock, match, onComplete);
+            if (firstGradient is null)
+            {
+                animator = null;
+                return false;
             }
 
-            Logger.TryGet(LogEventLevel.Error, LogArea.Animations)?.Log(
-                this,
-                "The animation's keyframe values didn't match any brush animators registered in BaseBrushAnimator.");
-            
-            return Disposable.Empty;
+            var gradientAnimator = new GradientBrushAnimator();
+            gradientAnimator.Property = Property;
+
+            foreach (var keyframe in this)
+            {
+                if (keyframe.Value is ISolidColorBrush solidColorBrush)
+                {
+                    gradientAnimator.Add(new AnimatorKeyFrame(typeof(GradientBrushAnimator), keyframe.Cue, keyframe.KeySpline)
+                    {
+                        Value = GradientBrushAnimator.ConvertSolidColorBrushToGradient(firstGradient, solidColorBrush)
+                    });
+                }
+                else if (keyframe.Value is IGradientBrush)
+                {
+                    gradientAnimator.Add(new AnimatorKeyFrame(typeof(GradientBrushAnimator), keyframe.Cue, keyframe.KeySpline)
+                    {
+                        Value = keyframe.Value
+                    });
+                }
+                else
+                {
+                    animator = null;
+                    return false;
+                }
+            }
+
+            animator = gradientAnimator;
+            return true;
         }
 
-        /// <inheritdoc/>
-        public override IBrush Interpolate(double progress, IBrush oldValue, IBrush newValue) => null;
+        private bool TryCreateSolidColorBrushAnimator([NotNullWhen(true)] out IAnimator? animator)
+        {
+            var solidColorBrushAnimator = new ISolidColorBrushAnimator();
+            solidColorBrushAnimator.Property = Property;
+
+            foreach (var keyframe in this)
+            {
+                if (keyframe.Value is ISolidColorBrush)
+                {
+                    solidColorBrushAnimator.Add(new AnimatorKeyFrame(typeof(ISolidColorBrushAnimator), keyframe.Cue, keyframe.KeySpline)
+                    {
+                        Value = keyframe.Value
+                    });
+                }
+                else
+                {
+                    animator = null;
+                    return false;
+                }
+            }
+
+            animator = solidColorBrushAnimator;
+            return true;
+        }
+
+        private bool TryCreateCustomRegisteredAnimator([NotNullWhen(true)] out IAnimator? animator)
+        {
+            if (_brushAnimators.Count > 0)
+            {
+                var firstKeyType = this[0].Value.GetType();
+                foreach (var (match, animatorType) in _brushAnimators)
+                {
+                    if (!match(firstKeyType))
+                        continue;
+
+                    animator = (IAnimator)Activator.CreateInstance(animatorType);
+                    if (animator != null)
+                    {
+                        animator.Property = Property;
+                        foreach (var keyframe in this)
+                        {
+                            animator.Add(new AnimatorKeyFrame(animatorType, keyframe.Cue, keyframe.KeySpline)
+                            {
+                                Value = keyframe.Value
+                            });
+                        }
+
+                        return true;
+                    }
+                }
+            }
+
+            animator = null;
+            return false;
+        }
     }
 }
diff --git a/src/Avalonia.Visuals/Animation/Animators/GradientBrushAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/GradientBrushAnimator.cs
new file mode 100644
index 0000000000..864e12413f
--- /dev/null
+++ b/src/Avalonia.Visuals/Animation/Animators/GradientBrushAnimator.cs
@@ -0,0 +1,123 @@
+using System;
+using System.Collections.Generic;
+
+using Avalonia.Data;
+using Avalonia.Media;
+using Avalonia.Media.Immutable;
+
+#nullable enable
+
+namespace Avalonia.Animation.Animators
+{
+    /// <summary>
+    /// Animator that handles <see cref="SolidColorBrush"/> values. 
+    /// </summary>
+    public class GradientBrushAnimator : Animator<IGradientBrush?>
+    {
+        private static readonly RelativePointAnimator s_relativePointAnimator = new RelativePointAnimator();
+        private static readonly DoubleAnimator s_doubleAnimator = new DoubleAnimator();
+
+        public override IGradientBrush? Interpolate(double progress, IGradientBrush? oldValue, IGradientBrush? newValue)
+        {
+            if (oldValue is null || newValue is null)
+            {
+                return progress >= 0.5 ? newValue : oldValue;
+            }
+
+            switch (oldValue)
+            {
+                case IRadialGradientBrush oldRadial when newValue is IRadialGradientBrush newRadial:
+                    return new ImmutableRadialGradientBrush(
+                        InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
+                        s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
+                        oldValue.SpreadMethod,
+                        s_relativePointAnimator.Interpolate(progress, oldRadial.Center, newRadial.Center),
+                        s_relativePointAnimator.Interpolate(progress, oldRadial.GradientOrigin, newRadial.GradientOrigin),
+                        s_doubleAnimator.Interpolate(progress, oldRadial.Radius, newRadial.Radius));
+
+                case IConicGradientBrush oldConic when newValue is IConicGradientBrush newConic:
+                    return new ImmutableConicGradientBrush(
+                        InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
+                        s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
+                        oldValue.SpreadMethod,
+                        s_relativePointAnimator.Interpolate(progress, oldConic.Center, newConic.Center),
+                        s_doubleAnimator.Interpolate(progress, oldConic.Angle, newConic.Angle));
+
+                case ILinearGradientBrush oldLinear when newValue is ILinearGradientBrush newLinear:
+                    return new ImmutableLinearGradientBrush(
+                        InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
+                        s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
+                        oldValue.SpreadMethod,
+                        s_relativePointAnimator.Interpolate(progress, oldLinear.StartPoint, newLinear.StartPoint),
+                        s_relativePointAnimator.Interpolate(progress, oldLinear.EndPoint, newLinear.EndPoint));
+
+                default:
+                    return progress >= 0.5 ? newValue : oldValue;
+            }
+        }
+
+        public override IDisposable BindAnimation(Animatable control, IObservable<IGradientBrush?> instance)
+        {
+            return control.Bind((AvaloniaProperty<IBrush?>)Property, instance, BindingPriority.Animation);
+        }
+
+        private IReadOnlyList<ImmutableGradientStop> InterpolateStops(double progress, IReadOnlyList<IGradientStop> oldValue, IReadOnlyList<IGradientStop> newValue)
+        {
+            var resultCount = Math.Max(oldValue.Count, newValue.Count);
+            var stops = new ImmutableGradientStop[resultCount];
+
+            for (int index = 0, oldIndex = 0, newIndex = 0; index < resultCount; index++)
+            {
+                stops[index] = new ImmutableGradientStop(
+                    s_doubleAnimator.Interpolate(progress, oldValue[oldIndex].Offset, newValue[newIndex].Offset),
+                    ColorAnimator.InterpolateCore(progress, oldValue[oldIndex].Color, newValue[newIndex].Color));
+
+                if (oldIndex < oldValue.Count - 1)
+                {
+                    oldIndex++;
+                }
+
+                if (newIndex < newValue.Count - 1)
+                {
+                    newIndex++;
+                }
+            }
+            
+            return stops;
+        }
+
+        internal static IGradientBrush ConvertSolidColorBrushToGradient(IGradientBrush gradientBrush, ISolidColorBrush solidColorBrush)
+        {
+            switch (gradientBrush)
+            {
+                case IRadialGradientBrush oldRadial:
+                    return new ImmutableRadialGradientBrush(
+                        CreateStopsFromSolidColorBrush(solidColorBrush, oldRadial.GradientStops), solidColorBrush.Opacity,
+                        oldRadial.SpreadMethod, oldRadial.Center, oldRadial.GradientOrigin, oldRadial.Radius);
+
+                case IConicGradientBrush oldConic:
+                    return new ImmutableConicGradientBrush(
+                        CreateStopsFromSolidColorBrush(solidColorBrush, oldConic.GradientStops), solidColorBrush.Opacity,
+                        oldConic.SpreadMethod, oldConic.Center, oldConic.Angle);
+
+                case ILinearGradientBrush oldLinear:
+                    return new ImmutableLinearGradientBrush(
+                        CreateStopsFromSolidColorBrush(solidColorBrush, oldLinear.GradientStops), solidColorBrush.Opacity,
+                        oldLinear.SpreadMethod, oldLinear.StartPoint, oldLinear.EndPoint);
+
+                default:
+                    throw new NotSupportedException($"Gradient of type {gradientBrush?.GetType()} is not supported");
+            }
+
+            static IReadOnlyList<ImmutableGradientStop> CreateStopsFromSolidColorBrush(ISolidColorBrush solidColorBrush, IReadOnlyList<IGradientStop> baseStops)
+            {
+                var stops = new ImmutableGradientStop[baseStops.Count];
+                for (int index = 0; index < baseStops.Count; index++)
+                {
+                    stops[index] = new ImmutableGradientStop(baseStops[index].Offset, solidColorBrush.Color);
+                }
+                return stops;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/Animators/RelativePointAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/RelativePointAnimator.cs
new file mode 100644
index 0000000000..348a2e4a35
--- /dev/null
+++ b/src/Avalonia.Visuals/Animation/Animators/RelativePointAnimator.cs
@@ -0,0 +1,20 @@
+namespace Avalonia.Animation.Animators
+{
+    /// <summary>
+    /// Animator that handles <see cref="RelativePoint"/> properties.
+    /// </summary>
+    public class RelativePointAnimator : Animator<RelativePoint>
+    {
+        private static readonly PointAnimator s_pointAnimator = new PointAnimator();
+
+        public override RelativePoint Interpolate(double progress, RelativePoint oldValue, RelativePoint newValue)
+        {
+            if (oldValue.Unit != newValue.Unit)
+            {
+                return progress >= 0.5 ? newValue : oldValue;
+            }
+
+            return new RelativePoint(s_pointAnimator.Interpolate(progress, oldValue.Point, newValue.Point), oldValue.Unit);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs
index a56cc1de8c..7c6372aae2 100644
--- a/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs
+++ b/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs
@@ -3,37 +3,39 @@ using Avalonia.Data;
 using Avalonia.Media;
 using Avalonia.Media.Immutable;
 
+#nullable enable
+
 namespace Avalonia.Animation.Animators
 {
     /// <summary>
     /// Animator that handles <see cref="SolidColorBrush"/> values. 
     /// </summary>
-    public class ISolidColorBrushAnimator : Animator<ISolidColorBrush>
+    public class ISolidColorBrushAnimator : Animator<ISolidColorBrush?>
     {
-        public override ISolidColorBrush Interpolate(double progress, ISolidColorBrush oldValue, ISolidColorBrush newValue)
+        public override ISolidColorBrush? Interpolate(double progress, ISolidColorBrush? oldValue, ISolidColorBrush? newValue)
         {
             if (oldValue is null || newValue is null)
             {
-                return oldValue;
+                return progress >= 0.5 ? newValue : oldValue;
             }
 
             return new ImmutableSolidColorBrush(ColorAnimator.InterpolateCore(progress, oldValue.Color, newValue.Color));
         }
 
-        public override IDisposable BindAnimation(Animatable control, IObservable<ISolidColorBrush> instance)
+        public override IDisposable BindAnimation(Animatable control, IObservable<ISolidColorBrush?> instance)
         {
-            return control.Bind((AvaloniaProperty<IBrush>)Property, instance, BindingPriority.Animation);
+            return control.Bind((AvaloniaProperty<IBrush?>)Property, instance, BindingPriority.Animation);
         }
     }
     
-    [Obsolete]    
-    public class SolidColorBrushAnimator : Animator<SolidColorBrush>
+    [Obsolete("Use ISolidColorBrushAnimator instead")]
+    public class SolidColorBrushAnimator : Animator<SolidColorBrush?>
     {    
-        public override SolidColorBrush Interpolate(double progress, SolidColorBrush oldValue, SolidColorBrush newValue)
+        public override SolidColorBrush? Interpolate(double progress, SolidColorBrush? oldValue, SolidColorBrush? newValue)
         {
             if (oldValue is null || newValue is null)
             {
-                return oldValue;
+                return progress >= 0.5 ? newValue : oldValue;
             }
 
             return new SolidColorBrush(ColorAnimator.InterpolateCore(progress, oldValue.Color, newValue.Color));
diff --git a/src/Avalonia.Visuals/Animation/Transitions/BrushTransition.cs b/src/Avalonia.Visuals/Animation/Transitions/BrushTransition.cs
index cc5af1b4b1..4d9c8af4d5 100644
--- a/src/Avalonia.Visuals/Animation/Transitions/BrushTransition.cs
+++ b/src/Avalonia.Visuals/Animation/Transitions/BrushTransition.cs
@@ -1,4 +1,5 @@
 using System;
+
 using Avalonia.Animation.Animators;
 using Avalonia.Animation.Easings;
 using Avalonia.Media;
@@ -9,37 +10,46 @@ namespace Avalonia.Animation
 {
     /// <summary>
     /// Transition class that handles <see cref="AvaloniaProperty"/> with <see cref="IBrush"/> type.
-    /// Only values of <see cref="ISolidColorBrush"/> will transition correctly at the moment.
     /// </summary>
     public class BrushTransition : Transition<IBrush?>
     {
-        private static readonly ISolidColorBrushAnimator s_animator = new ISolidColorBrushAnimator();
+        private static readonly GradientBrushAnimator s_gradientAnimator = new GradientBrushAnimator();
+        private static readonly ISolidColorBrushAnimator s_solidColorBrushAnimator = new ISolidColorBrushAnimator();
 
         public override IObservable<IBrush?> DoTransition(IObservable<double> progress, IBrush? oldValue, IBrush? newValue)
         {
-            var oldSolidColorBrush = TryGetSolidColorBrush(oldValue);
-            var newSolidColorBrush = TryGetSolidColorBrush(newValue);
-
-            if (oldSolidColorBrush != null && newSolidColorBrush != null)
+            if (oldValue is null || newValue is null)
             {
-                return new AnimatorTransitionObservable<ISolidColorBrush, ISolidColorBrushAnimator>(
-                    s_animator, progress, Easing, oldSolidColorBrush, newSolidColorBrush);
+                return new IncompatibleTransitionObservable(progress, Easing, oldValue, newValue);
             }
 
-            return new IncompatibleTransitionObservable(progress, Easing, oldValue, newValue);
-        }
+            if (oldValue is IGradientBrush oldGradient)
+            {
+                if (newValue is IGradientBrush newGradient)
+                {
+                    return new AnimatorTransitionObservable<IGradientBrush?, GradientBrushAnimator>(s_gradientAnimator, progress, Easing, oldGradient, newGradient);
+                }
+                else if (newValue is ISolidColorBrush newSolidColorBrushToConvert)
+                {
+                    var convertedSolidColorBrush = GradientBrushAnimator.ConvertSolidColorBrushToGradient(oldGradient, newSolidColorBrushToConvert);
+                    return new AnimatorTransitionObservable<IGradientBrush?, GradientBrushAnimator>(s_gradientAnimator, progress, Easing, oldGradient, convertedSolidColorBrush);
+                }
+            }
+            else if (newValue is IGradientBrush newGradient && oldValue is ISolidColorBrush oldSolidColorBrushToConvert)
+            {
+                var convertedSolidColorBrush = GradientBrushAnimator.ConvertSolidColorBrushToGradient(newGradient, oldSolidColorBrushToConvert);
+                return new AnimatorTransitionObservable<IGradientBrush?, GradientBrushAnimator>(s_gradientAnimator, progress, Easing, convertedSolidColorBrush, newGradient);
+            }
 
-        private static ISolidColorBrush? TryGetSolidColorBrush(IBrush? brush)
-        {
-            if (brush is null)
+            if (oldValue is ISolidColorBrush oldSolidColorBrush && newValue is ISolidColorBrush newSolidColorBrush)
             {
-                return Brushes.Transparent;
+                return new AnimatorTransitionObservable<ISolidColorBrush?, ISolidColorBrushAnimator>(s_solidColorBrushAnimator, progress, Easing, oldSolidColorBrush, newSolidColorBrush);
             }
 
-            return brush as ISolidColorBrush;
+            return new IncompatibleTransitionObservable(progress, Easing, oldValue, newValue);
         }
 
-        private class IncompatibleTransitionObservable : TransitionObservableBase<IBrush?>
+        private sealed class IncompatibleTransitionObservable : TransitionObservableBase<IBrush?>
         {
             private readonly IBrush? _from;
             private readonly IBrush? _to;
@@ -52,7 +62,7 @@ namespace Avalonia.Animation
 
             protected override IBrush? ProduceValue(double progress)
             {
-                return progress < 0.5 ? _from : _to;
+                return progress >= 0.5 ? _to : _from;
             }
         }
     }
diff --git a/src/Avalonia.Visuals/Animation/Transitions/RelativePointTransition.cs b/src/Avalonia.Visuals/Animation/Transitions/RelativePointTransition.cs
new file mode 100644
index 0000000000..4a7bfa8384
--- /dev/null
+++ b/src/Avalonia.Visuals/Animation/Transitions/RelativePointTransition.cs
@@ -0,0 +1,11 @@
+using Avalonia.Animation.Animators;
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Transition class that handles <see cref="AvaloniaProperty"/> with <see cref="RelativePoint"/> type.
+    /// </summary>  
+    public class RelativePointTransition : AnimatorDrivenTransition<RelativePoint, RelativePointAnimator>
+    {
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/DrawingGroup.cs b/src/Avalonia.Visuals/Media/DrawingGroup.cs
index e581c8c553..eeb6318ebd 100644
--- a/src/Avalonia.Visuals/Media/DrawingGroup.cs
+++ b/src/Avalonia.Visuals/Media/DrawingGroup.cs
@@ -12,6 +12,12 @@ namespace Avalonia.Media
         public static readonly StyledProperty<Transform> TransformProperty =
             AvaloniaProperty.Register<DrawingGroup, Transform>(nameof(Transform));
 
+        public static readonly StyledProperty<Geometry> ClipGeometryProperty =
+            AvaloniaProperty.Register<DrawingGroup, Geometry>(nameof(ClipGeometry));
+
+        public static readonly StyledProperty<IBrush> OpacityMaskProperty =
+            AvaloniaProperty.Register<DrawingGroup, IBrush>(nameof(OpacityMask));
+
         public double Opacity
         {
             get => GetValue(OpacityProperty);
@@ -24,6 +30,18 @@ namespace Avalonia.Media
             set => SetValue(TransformProperty, value);
         }
 
+        public Geometry ClipGeometry
+        {
+            get => GetValue(ClipGeometryProperty);
+            set => SetValue(ClipGeometryProperty, value);
+        }
+
+        public IBrush OpacityMask
+        {
+            get => GetValue(OpacityMaskProperty);
+            set => SetValue(OpacityMaskProperty, value);
+        }
+
         [Content]
         public AvaloniaList<Drawing> Children { get; } = new AvaloniaList<Drawing>();
 
@@ -31,6 +49,8 @@ namespace Avalonia.Media
         {
             using (context.PushPreTransform(Transform?.Value ?? Matrix.Identity))
             using (context.PushOpacity(Opacity))
+            using (ClipGeometry != null ? context.PushGeometryClip(ClipGeometry) : default(DrawingContext.PushedState))
+            using (OpacityMask != null ? context.PushOpacityMask(OpacityMask, GetBounds()) : default(DrawingContext.PushedState))
             {
                 foreach (var drawing in Children)
                 {
diff --git a/src/Avalonia.Visuals/Media/GlyphRun.cs b/src/Avalonia.Visuals/Media/GlyphRun.cs
index 2b787462e4..234122f6f5 100644
--- a/src/Avalonia.Visuals/Media/GlyphRun.cs
+++ b/src/Avalonia.Visuals/Media/GlyphRun.cs
@@ -582,7 +582,7 @@ namespace Avalonia.Media
                 {
                     var cluster = _glyphClusters[i];
 
-                    var codepointIndex = cluster - _characters.Start;
+                    var codepointIndex = IsLeftToRight ? cluster - _characters.Start : _characters.End - cluster;
 
                     var codepoint = Codepoint.ReadAt(_characters, codepointIndex, out _);
 
diff --git a/src/Avalonia.Visuals/Media/GradientBrush.cs b/src/Avalonia.Visuals/Media/GradientBrush.cs
index 99923b8e06..5f795d4644 100644
--- a/src/Avalonia.Visuals/Media/GradientBrush.cs
+++ b/src/Avalonia.Visuals/Media/GradientBrush.cs
@@ -2,6 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
+
+using Avalonia.Animation.Animators;
 using Avalonia.Collections;
 using Avalonia.Metadata;
 
diff --git a/src/Avalonia.Visuals/Media/SolidColorBrush.cs b/src/Avalonia.Visuals/Media/SolidColorBrush.cs
index fd94cbd214..962819a1a1 100644
--- a/src/Avalonia.Visuals/Media/SolidColorBrush.cs
+++ b/src/Avalonia.Visuals/Media/SolidColorBrush.cs
@@ -16,7 +16,6 @@ namespace Avalonia.Media
 
         static SolidColorBrush()
         {
-            BaseBrushAnimator.RegisterBrushAnimator<ISolidColorBrushAnimator>(match => typeof(ISolidColorBrush).IsAssignableFrom(match));
             AffectsRender<SolidColorBrush>(ColorProperty);
         }
 
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs b/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs
index b304b19910..64befe2e5c 100644
--- a/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs
+++ b/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs
@@ -90,7 +90,9 @@ namespace Avalonia.Media.TextFormatting
         /// <returns>The split result.</returns>
         public SplitTextCharactersResult Split(int length)
         {
-            var glyphCount = GlyphRun.FindGlyphIndex(GlyphRun.Characters.Start + length);
+            var glyphCount = GlyphRun.IsLeftToRight ?
+                GlyphRun.FindGlyphIndex(GlyphRun.Characters.Start + length) :
+                GlyphRun.FindGlyphIndex(GlyphRun.Characters.End - length);
 
             if (GlyphRun.Characters.Length == length)
             {
@@ -102,31 +104,64 @@ namespace Avalonia.Media.TextFormatting
                 return new SplitTextCharactersResult(this, null);
             }
 
-            var firstGlyphRun = new GlyphRun(
-                Properties.Typeface.GlyphTypeface,
-                Properties.FontRenderingEmSize,
-                GlyphRun.GlyphIndices.Take(glyphCount),
-                GlyphRun.GlyphAdvances.Take(glyphCount),
-                GlyphRun.GlyphOffsets.Take(glyphCount),
-                GlyphRun.Characters.Take(length),
-                GlyphRun.GlyphClusters.Take(glyphCount),
-                GlyphRun.BiDiLevel);
-
-            var firstTextRun = new ShapedTextCharacters(firstGlyphRun, Properties);
-
-            var secondGlyphRun = new GlyphRun(
-                Properties.Typeface.GlyphTypeface,
-                Properties.FontRenderingEmSize,
-                GlyphRun.GlyphIndices.Skip(glyphCount),
-                GlyphRun.GlyphAdvances.Skip(glyphCount),
-                GlyphRun.GlyphOffsets.Skip(glyphCount),
-                GlyphRun.Characters.Skip(length),
-                GlyphRun.GlyphClusters.Skip(glyphCount),
-                GlyphRun.BiDiLevel);
-
-            var secondTextRun = new ShapedTextCharacters(secondGlyphRun, Properties);
-
-            return new SplitTextCharactersResult(firstTextRun, secondTextRun);
+            if (GlyphRun.IsLeftToRight)
+            {
+                var firstGlyphRun = new GlyphRun(
+                    Properties.Typeface.GlyphTypeface,
+                    Properties.FontRenderingEmSize,
+                    GlyphRun.GlyphIndices.Take(glyphCount),
+                    GlyphRun.GlyphAdvances.Take(glyphCount),
+                    GlyphRun.GlyphOffsets.Take(glyphCount),
+                    GlyphRun.Characters.Take(length),
+                    GlyphRun.GlyphClusters.Take(glyphCount),
+                    GlyphRun.BiDiLevel);
+
+                var firstTextRun = new ShapedTextCharacters(firstGlyphRun, Properties);
+
+                var secondGlyphRun = new GlyphRun(
+                    Properties.Typeface.GlyphTypeface,
+                    Properties.FontRenderingEmSize,
+                    GlyphRun.GlyphIndices.Skip(glyphCount),
+                    GlyphRun.GlyphAdvances.Skip(glyphCount),
+                    GlyphRun.GlyphOffsets.Skip(glyphCount),
+                    GlyphRun.Characters.Skip(length),
+                    GlyphRun.GlyphClusters.Skip(glyphCount),
+                    GlyphRun.BiDiLevel);
+
+                var secondTextRun = new ShapedTextCharacters(secondGlyphRun, Properties);
+
+                return new SplitTextCharactersResult(firstTextRun, secondTextRun);
+            }
+            else
+            {
+                var take = GlyphRun.GlyphIndices.Length - glyphCount;
+                
+                var firstGlyphRun = new GlyphRun(
+                    Properties.Typeface.GlyphTypeface,
+                    Properties.FontRenderingEmSize,
+                    GlyphRun.GlyphIndices.Take(take),
+                    GlyphRun.GlyphAdvances.Take(take),
+                    GlyphRun.GlyphOffsets.Take(take),
+                    GlyphRun.Characters.Skip(length),
+                    GlyphRun.GlyphClusters.Take(take),
+                    GlyphRun.BiDiLevel);
+
+                var firstTextRun = new ShapedTextCharacters(firstGlyphRun, Properties);
+
+                var secondGlyphRun = new GlyphRun(
+                    Properties.Typeface.GlyphTypeface,
+                    Properties.FontRenderingEmSize,
+                    GlyphRun.GlyphIndices.Skip(take),
+                    GlyphRun.GlyphAdvances.Skip(take),
+                    GlyphRun.GlyphOffsets.Skip(take),
+                    GlyphRun.Characters.Take(length),
+                    GlyphRun.GlyphClusters.Skip(take),
+                    GlyphRun.BiDiLevel);
+
+                var secondTextRun = new ShapedTextCharacters(secondGlyphRun, Properties);
+
+                return new SplitTextCharactersResult(secondTextRun,firstTextRun);
+            }
         }
 
         public readonly struct SplitTextCharactersResult
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextCharacters.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextCharacters.cs
index 0779716ec8..cfca8f9ab2 100644
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextCharacters.cs
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextCharacters.cs
@@ -134,7 +134,7 @@ namespace Avalonia.Media.TextFormatting
             var isFallback = typeface != defaultTypeface;
 
             count = 0;
-            var script = Script.Common;
+            var script = Script.Unknown;
             var direction = BiDiClass.LeftToRight;
 
             var font = typeface.GlyphTypeface;
@@ -161,7 +161,7 @@ namespace Avalonia.Media.TextFormatting
 
                 if (currentScript != script)
                 {
-                    if (script == Script.Inherited || script == Script.Common)
+                    if (script is Script.Unknown)
                     {
                         script = currentScript;
                     }
@@ -174,13 +174,16 @@ namespace Avalonia.Media.TextFormatting
                     }
                 }
 
-                if (currentScript != Script.Common && currentScript != Script.Inherited)
+                //Only handle non whitespace here
+                if (!currentGrapheme.FirstCodepoint.IsWhiteSpace)
                 {
+                    //Stop at the first glyph that is present in the default typeface.
                     if (isFallback && defaultFont.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
                     {
                         break;
                     }
 
+                    //Stop at the first missing glyph
                     if (!font.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
                     {
                         break;
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs
index 6533c34ba0..df63b00c25 100644
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs
@@ -70,34 +70,74 @@ namespace Avalonia.Media.TextFormatting
             {
                 var glyphTypeface = glyphRun.GlyphTypeface;
 
-                for (var i = 0; i < glyphRun.GlyphClusters.Length; i++)
+                if (glyphRun.IsLeftToRight)
                 {
-                    var glyph = glyphRun.GlyphIndices[i];
+                    foreach (var glyph in glyphRun.GlyphIndices)
+                    {
+                        var advance = glyphTypeface.GetGlyphAdvance(glyph) * glyphRun.Scale;
 
-                    var advance = glyphTypeface.GetGlyphAdvance(glyph) * glyphRun.Scale;
+                        if (currentWidth + advance > availableWidth)
+                        {
+                            break;
+                        }
 
-                    if (currentWidth + advance > availableWidth)
-                    {
-                        break;
+                        currentWidth += advance;
+
+                        glyphCount++;
                     }
+                }
+                else
+                {
+                    for (var index = glyphRun.GlyphClusters.Length - 1; index > 0; index--)
+                    {
+                        var glyph = glyphRun.GlyphIndices[index];
+
+                        var advance = glyphTypeface.GetGlyphAdvance(glyph) * glyphRun.Scale;
 
-                    currentWidth += advance;
+                        if (currentWidth + advance > availableWidth)
+                        {
+                            break;
+                        }
 
-                    glyphCount++;
+                        currentWidth += advance;
+
+                        glyphCount++;
+                    }
                 }
             }
             else
             {
-                foreach (var advance in glyphRun.GlyphAdvances)
+                if (glyphRun.IsLeftToRight)
                 {
-                    if (currentWidth + advance > availableWidth)
+                    for (var index = 0; index < glyphRun.GlyphAdvances.Length; index++)
                     {
-                        break;
+                        var advance = glyphRun.GlyphAdvances[index];
+                    
+                        if (currentWidth + advance > availableWidth)
+                        {
+                            break;
+                        }
+
+                        currentWidth += advance;
+
+                        glyphCount++;
                     }
+                }
+                else
+                {
+                    for (var index = glyphRun.GlyphAdvances.Length - 1; index > 0; index--)
+                    {
+                        var advance = glyphRun.GlyphAdvances[index];
+                    
+                        if (currentWidth + advance > availableWidth)
+                        {
+                            break;
+                        }
 
-                    currentWidth += advance;
+                        currentWidth += advance;
 
-                    glyphCount++;
+                        glyphCount++;
+                    }
                 }
             }
 
@@ -475,24 +515,14 @@ namespace Avalonia.Media.TextFormatting
 
             var remainingCharacters = splitResult.Second;
 
-            if (currentLineBreak?.RemainingCharacters != null)
+            var lineBreak = remainingCharacters?.Count > 0 ? new TextLineBreak(remainingCharacters) : null;
+
+            if (lineBreak is null && currentLineBreak.TextEndOfLine != null)
             {
-                if (remainingCharacters != null)
-                {
-                    remainingCharacters.AddRange(currentLineBreak.RemainingCharacters);
-                }
-                else
-                {
-                    remainingCharacters = new List<ShapedTextCharacters>(currentLineBreak.RemainingCharacters);
-                }
+                lineBreak = new TextLineBreak(currentLineBreak.TextEndOfLine);
             }
 
-            var lineBreak = remainingCharacters != null && remainingCharacters.Count > 0 ?
-                new TextLineBreak(remainingCharacters) :
-                null;
-
-            return new TextLineImpl(splitResult.First, textRange, paragraphWidth, paragraphProperties,
-                lineBreak);
+            return new TextLineImpl(splitResult.First, textRange, paragraphWidth, paragraphProperties, lineBreak);
         }
 
         /// <summary>
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
index 4d02f94cad..40891a700d 100644
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
+++ b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
@@ -284,7 +284,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
             // - U+0028 (Left Opening Parenthesis)
             // - U+005B (Opening Square Bracket)
             // - U+007B (Left Curly Bracket)
-            // See custom colums|rules in the text pair table.
+            // See custom columns|rules in the text pair table.
             // https://www.unicode.org/Public/13.0.0/ucd/auxiliary/LineBreakTest.html
             _lb30 = _alphaNumericCount > 0
                 && cls == LineBreakClass.OpenPunctuation
diff --git a/src/Avalonia.Visuals/Media/Transformation/InterpolationUtilities.cs b/src/Avalonia.Visuals/Media/Transformation/InterpolationUtilities.cs
index 1e80eabfc8..742bb9c804 100644
--- a/src/Avalonia.Visuals/Media/Transformation/InterpolationUtilities.cs
+++ b/src/Avalonia.Visuals/Media/Transformation/InterpolationUtilities.cs
@@ -25,14 +25,14 @@ namespace Avalonia.Media.Transformation
                    Matrix.CreateScale(decomposed.Scale);
         }
 
-        public static Matrix.Decomposed InterpolateDecomposedTransforms(ref Matrix.Decomposed from, ref Matrix.Decomposed to, double progres)
+        public static Matrix.Decomposed InterpolateDecomposedTransforms(ref Matrix.Decomposed from, ref Matrix.Decomposed to, double progress)
         {
             Matrix.Decomposed result = default;
 
-            result.Translate = InterpolateVectors(from.Translate, to.Translate, progres);
-            result.Scale = InterpolateVectors(from.Scale, to.Scale, progres);
-            result.Skew = InterpolateVectors(from.Skew, to.Skew, progres);
-            result.Angle = InterpolateScalars(from.Angle, to.Angle, progres);
+            result.Translate = InterpolateVectors(from.Translate, to.Translate, progress);
+            result.Scale = InterpolateVectors(from.Scale, to.Scale, progress);
+            result.Skew = InterpolateVectors(from.Skew, to.Skew, progress);
+            result.Angle = InterpolateScalars(from.Angle, to.Angle, progress);
 
             return result;
         }
diff --git a/src/Avalonia.Visuals/RelativePoint.cs b/src/Avalonia.Visuals/RelativePoint.cs
index 097ea69be4..497820ec65 100644
--- a/src/Avalonia.Visuals/RelativePoint.cs
+++ b/src/Avalonia.Visuals/RelativePoint.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Globalization;
+
+using Avalonia.Animation.Animators;
 using Avalonia.Utilities;
 
 namespace Avalonia
@@ -45,6 +47,11 @@ namespace Avalonia
 
         private readonly RelativeUnit _unit;
 
+        static RelativePoint()
+        {
+            Animation.Animation.RegisterAnimator<RelativePointAnimator>(prop => typeof(RelativePoint).IsAssignableFrom(prop.PropertyType));
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="RelativePoint"/> struct.
         /// </summary>
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
index f2a09b815e..c6cdf474bb 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
@@ -258,14 +258,25 @@ namespace Avalonia.Rendering.SceneGraph
                         }
                         else if (visualChildren.Count > 1)
                         {
-                            var sortedChildren = new IVisual[visualChildren.Count];
-                            visualChildren.CopyTo(sortedChildren, 0);
+                            var count = visualChildren.Count;
+                            var sortedChildren = new (IVisual visual, int index)[count];
 
-                            Array.Sort(sortedChildren, ZIndexComparer.ComparisonInstance);
+                            for (var i = 0; i < count; i++)
+                            {
+                                sortedChildren[i] = (visualChildren[i], i);
+                            }
+
+                            // Regular Array.Sort is unstable, we need to provide indices as well to avoid reshuffling elements.
+                            Array.Sort(sortedChildren, (lhs, rhs) =>
+                            {
+                                var result = ZIndexComparer.Instance.Compare(lhs.visual, rhs.visual);
+
+                                return result == 0 ? lhs.index.CompareTo(rhs.index) : result;
+                            });
 
                             foreach (var child in sortedChildren)
                             {
-                                var childNode = GetOrCreateChildNode(scene, child, node);
+                                var childNode = GetOrCreateChildNode(scene, child.Item1, node);
                                 Update(context, scene, (VisualNode)childNode, clip, forceRecurse);
                             }
                         }
diff --git a/src/Avalonia.Visuals/VisualTree/IVisualTreeHost.cs b/src/Avalonia.Visuals/VisualTree/IVisualTreeHost.cs
index b63c49bd5a..01212b238d 100644
--- a/src/Avalonia.Visuals/VisualTree/IVisualTreeHost.cs
+++ b/src/Avalonia.Visuals/VisualTree/IVisualTreeHost.cs
@@ -1,8 +1,11 @@
+using System;
+
 namespace Avalonia.VisualTree
 {
     /// <summary>
     /// Interface for controls that host their own separate visual tree, such as popups.
     /// </summary>
+    [Obsolete]
     public interface IVisualTreeHost
     {
         /// <summary>
diff --git a/src/Avalonia.X11/X11Platform.cs b/src/Avalonia.X11/X11Platform.cs
index a57bdbdf87..3a919c8814 100644
--- a/src/Avalonia.X11/X11Platform.cs
+++ b/src/Avalonia.X11/X11Platform.cs
@@ -162,14 +162,49 @@ namespace Avalonia.X11
 
 namespace Avalonia
 {
-
+    /// <summary>
+    /// Platform-specific options which apply to Linux.
+    /// </summary>
     public class X11PlatformOptions
     {
+        /// <summary>
+        /// Enables native Linux EGL when set to true. The default value is false.
+        /// </summary>
         public bool UseEGL { get; set; }
+
+        /// <summary>
+        /// Determines whether to use GPU for rendering in your project. The default value is true.
+        /// </summary>
         public bool UseGpu { get; set; } = true;
+
+        /// <summary>
+        /// Embeds popups to the window when set to true. The default value is false.
+        /// </summary>
         public bool OverlayPopups { get; set; }
+
+        /// <summary>
+        /// Enables global menu support on Linux desktop environments where it's supported (e. g. XFCE and MATE with plugin, KDE, etc).
+        /// The default value is false.
+        /// </summary>
         public bool UseDBusMenu { get; set; }
+
+        /// <summary>
+        /// Deferred renderer would be used when set to true. Immediate renderer when set to false. The default value is true.
+        /// </summary>
+        /// <remarks>
+        /// Avalonia has two rendering modes: Immediate and Deferred rendering.
+        /// Immediate re-renders the whole scene when some element is changed on the scene. Deferred re-renders only changed elements.
+        /// </remarks>
         public bool UseDeferredRendering { get; set; } = true;
+
+        /// <summary>
+        /// Determines whether to use IME.
+        /// IME would be enabled by default if the current user input language is one of the following: Mandarin, Japanese, Vietnamese or Korean.
+        /// </summary>
+        /// <remarks>
+        /// Input method editor is a component that enables users to generate characters not natively available 
+        /// on their input devices by using sequences of characters or mouse operations that are natively available on their input devices.
+        /// </remarks>
         public bool? EnableIme { get; set; }
 
         public IList<GlVersion> GlProfiles { get; set; } = new List<GlVersion>
@@ -190,7 +225,14 @@ namespace Avalonia
             "llvmpipe"
         };
         public string WmClass { get; set; } = Assembly.GetEntryAssembly()?.GetName()?.Name ?? "AvaloniaApplication";
-        public bool? EnableMultiTouch { get; set; }
+
+        /// <summary>
+        /// Enables multitouch support. The default value is true.
+        /// </summary>
+        /// <remarks>
+        /// Multitouch allows a surface (a touchpad or touchscreen) to recognize the presence of more than one point of contact with the surface at the same time.
+        /// </remarks>
+        public bool? EnableMultiTouch { get; set; } = true;
     }
     public static class AvaloniaX11PlatformExtensions
     {
diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs
index bcb655245a..149d7fb9b2 100644
--- a/src/Avalonia.X11/X11Window.cs
+++ b/src/Avalonia.X11/X11Window.cs
@@ -336,7 +336,7 @@ namespace Avalonia.X11
         public IEnumerable<object> Surfaces { get; }
         public Action<RawInputEventArgs> Input { get; set; }
         public Action<Rect> Paint { get; set; }
-        public Action<Size> Resized { get; set; }
+        public Action<Size, PlatformResizeReason> Resized { get; set; }
         //TODO
         public Action<double> ScalingChanged { get; set; }
         public Action Deactivated { get; set; }
@@ -510,7 +510,7 @@ namespace Avalonia.X11
                         UpdateImePosition();
 
                         if (changedSize && !updatedSizeViaScaling && !_popup)
-                            Resized?.Invoke(ClientSize);
+                            Resized?.Invoke(ClientSize, PlatformResizeReason.Unspecified);
 
                         Dispatcher.UIThread.RunJobs(DispatcherPriority.Layout);
                     }, DispatcherPriority.Layout);
@@ -565,7 +565,7 @@ namespace Avalonia.X11
                     UpdateImePosition();
                     SetMinMaxSize(_scaledMinMaxSize.minSize, _scaledMinMaxSize.maxSize);
                     if(!skipResize)
-                        Resize(oldScaledSize, true);
+                        Resize(oldScaledSize, true, PlatformResizeReason.DpiChange);
                     return true;
                 }
 
@@ -616,7 +616,7 @@ namespace Avalonia.X11
             {
                 // Occurs once the window has been mapped, which is the earliest the extents
                 // can be retrieved, so invoke event to force update of TopLevel.FrameSize.
-                Resized.Invoke(ClientSize);
+                Resized.Invoke(ClientSize, PlatformResizeReason.Unspecified);
             }
 
             if (atom == _x11.Atoms._NET_WM_STATE)
@@ -839,7 +839,7 @@ namespace Avalonia.X11
                 XSetTransientForHint(_x11.Display, _handle, parent.Handle.Handle);
         }
 
-        public void Show(bool activate)
+        public void Show(bool activate, bool isDialog)
         {
             _wasMappedAtLeastOnce = true;
             XMapWindow(_x11.Display, _handle);
@@ -862,19 +862,19 @@ namespace Avalonia.X11
         }
 
 
-        public void Resize(Size clientSize) => Resize(clientSize, false);
+        public void Resize(Size clientSize, PlatformResizeReason reason) => Resize(clientSize, false, reason);
         public void Move(PixelPoint point) => Position = point;
         private void MoveResize(PixelPoint position, Size size, double scaling)
         {
             Move(position);
             _scalingOverride = scaling;
             UpdateScaling(true);
-            Resize(size, true);
+            Resize(size, true, PlatformResizeReason.Layout);
         }
 
         PixelSize ToPixelSize(Size size) => new PixelSize((int)(size.Width * RenderScaling), (int)(size.Height * RenderScaling));
         
-        void Resize(Size clientSize, bool force)
+        void Resize(Size clientSize, bool force, PlatformResizeReason reason)
         {
             if (!force && clientSize == ClientSize)
                 return;
@@ -891,7 +891,7 @@ namespace Avalonia.X11
             if (force || !_wasMappedAtLeastOnce || (_popup && needImmediatePopupResize))
             {
                 _realSize = pixelSize;
-                Resized?.Invoke(ClientSize);
+                Resized?.Invoke(ClientSize, reason);
             }
         }
         
@@ -1024,15 +1024,22 @@ namespace Avalonia.X11
                 side = NetWmMoveResize._NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT;
             BeginMoveResize(side, e);
         }
-        
+
         public void SetTitle(string title)
         {
-            var data = Encoding.UTF8.GetBytes(title);
-            fixed (void* pdata = data)
+            if (string.IsNullOrEmpty(title))
             {
-                XChangeProperty(_x11.Display, _handle, _x11.Atoms._NET_WM_NAME, _x11.Atoms.UTF8_STRING, 8,
-                    PropertyMode.Replace, pdata, data.Length);
-                XStoreName(_x11.Display, _handle, title);
+                XDeleteProperty(_x11.Display, _handle, _x11.Atoms._NET_WM_NAME);
+            }
+            else
+            {
+                var data = Encoding.UTF8.GetBytes(title);
+                fixed (void* pdata = data)
+                {
+                    XChangeProperty(_x11.Display, _handle, _x11.Atoms._NET_WM_NAME, _x11.Atoms.UTF8_STRING, 8,
+                        PropertyMode.Replace, pdata, data.Length);
+                    XStoreName(_x11.Display, _handle, title);
+                }
             }
         }
 
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs b/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs
index 5a1da9058a..b097e0917f 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs
@@ -69,7 +69,7 @@ namespace Avalonia.LinuxFramebuffer
         public IEnumerable<object> Surfaces { get; }
         public Action<RawInputEventArgs> Input { get; set; }
         public Action<Rect> Paint { get; set; }
-        public Action<Size> Resized { get; set; }
+        public Action<Size, PlatformResizeReason> Resized { get; set; }
         public Action<double> ScalingChanged { get; set; }
 
         public Action<WindowTransparencyLevel> TransparencyLevelChanged { get; set; }
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathParser.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathParser.cs
index 24cded1d22..890cbb69bf 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathParser.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathParser.cs
@@ -9,7 +9,6 @@ using XamlX.Ast;
 using XamlX.Transform;
 using XamlX.Transform.Transformers;
 using XamlX.TypeSystem;
-
 using XamlParseException = XamlX.XamlParseException;
 
 namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
@@ -21,6 +20,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             if (node is XamlAstObjectNode binding && binding.Type.GetClrType().Equals(context.GetAvaloniaTypes().CompiledBindingExtension))
             {
                 var convertedNode = ConvertLongFormPropertiesToBindingExpressionNode(context, binding);
+                var foundPath = false;
 
                 if (binding.Arguments.Count > 0 && binding.Arguments[0] is XamlAstTextNode bindingPathText)
                 {
@@ -32,9 +32,18 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                         nodes.Insert(nodes.TakeWhile(x => x is BindingExpressionGrammar.ITransformNode).Count(), convertedNode);
                     }
 
-                    binding.Arguments[0] = new ParsedBindingPathNode(bindingPathText, context.GetAvaloniaTypes().CompiledBindingPath, nodes);
+                    if (nodes.Count == 1 && nodes[0] is BindingExpressionGrammar.EmptyExpressionNode)
+                    {
+                        binding.Arguments.RemoveAt(0);
+                    }
+                    else
+                    {
+                        binding.Arguments[0] = new ParsedBindingPathNode(bindingPathText, context.GetAvaloniaTypes().CompiledBindingPath, nodes);
+                        foundPath = true;
+                    }
                 }
-                else
+                
+                if (!foundPath)
                 {
                     var bindingPathAssignment = binding.Children.OfType<XamlAstXamlPropertyValueNode>()
                         .FirstOrDefault(v => v.Property.GetClrProperty().Name == "Path");
@@ -44,12 +53,19 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                         var reader = new CharacterReader(pathValue.Text.AsSpan());
                         var (nodes, _) = BindingExpressionGrammar.Parse(ref reader);
 
-                        if (convertedNode != null)
+                        if (nodes.Count == 1 && nodes[0] is BindingExpressionGrammar.EmptyExpressionNode)
                         {
-                            nodes.Insert(nodes.TakeWhile(x => x is BindingExpressionGrammar.ITransformNode).Count(), convertedNode);
+                            bindingPathAssignment.Values.RemoveAt(0);
                         }
+                        else
+                        {
+                            if (convertedNode != null)
+                            {
+                                nodes.Insert(nodes.TakeWhile(x => x is BindingExpressionGrammar.ITransformNode).Count(), convertedNode);
+                            }
 
-                        bindingPathAssignment.Values[0] = new ParsedBindingPathNode(pathValue, context.GetAvaloniaTypes().CompiledBindingPath, nodes);
+                            bindingPathAssignment.Values[0] = new ParsedBindingPathNode(pathValue, context.GetAvaloniaTypes().CompiledBindingPath, nodes);
+                        }
                     }
                 }
             }
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index 2352b8b076..c9a5544672 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -506,7 +506,7 @@ namespace Avalonia.Skia
         public void PushGeometryClip(IGeometryImpl clip)
         {
             Canvas.Save();
-            Canvas.ClipPath(((GeometryImpl)clip).EffectivePath);
+            Canvas.ClipPath(((GeometryImpl)clip).EffectivePath, SKClipOperation.Intersect, true);
         }
 
         /// <inheritdoc />
@@ -534,7 +534,11 @@ namespace Avalonia.Skia
         public void PushOpacityMask(IBrush mask, Rect bounds)
         {
             // TODO: This should be disposed
-            var paint = new SKPaint();
+            var paint = new SKPaint()
+            {
+                IsAntialias = true,
+                Style = SKPaintStyle.StrokeAndFill
+            };
 
             Canvas.SaveLayer(paint);
             _maskStack.Push(CreatePaint(paint, mask, bounds, true));
@@ -543,7 +547,14 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void PopOpacityMask()
         {
-            using (var paint = new SKPaint { BlendMode = SKBlendMode.DstIn })
+            using (var paint = new SKPaint
+            {
+                IsAntialias = true,
+                Style = SKPaintStyle.StrokeAndFill,
+                BlendMode = SKBlendMode.DstIn,
+                Color = new SKColor(0, 0, 0, 255),
+                ColorFilter = SKColorFilter.CreateLumaColor()
+            })
             {
                 Canvas.SaveLayer(paint);
                 using (var paintWrapper = _maskStack.Pop())
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
index 9336c9a7bb..09e5b7c71a 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
@@ -541,7 +541,8 @@ namespace Avalonia.Direct2D1.Media
                 ContentBounds = PrimitiveExtensions.RectangleInfinite,
                 MaskTransform = PrimitiveExtensions.Matrix3x2Identity,
                 Opacity = 1,
-                GeometricMask = ((GeometryImpl)clip).Geometry
+                GeometricMask = ((GeometryImpl)clip).Geometry,
+                MaskAntialiasMode = AntialiasMode.PerPrimitive
             };
             var layer = _layerPool.Count != 0 ? _layerPool.Pop() : new Layer(_deviceContext);
             _deviceContext.PushLayer(ref parameters, layer);
diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs b/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs
index 73e46b9e13..d36db107e3 100644
--- a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs
+++ b/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs
@@ -44,7 +44,7 @@ namespace Avalonia.Win32.Interop.Wpf
                 ((FrameworkElement)PlatformImpl)?.InvalidateMeasure();
             }
 
-            protected override void HandleResized(Size clientSize)
+            protected override void HandleResized(Size clientSize, PlatformResizeReason reason)
             {
                 ClientSize = clientSize;
                 LayoutManager.ExecuteLayoutPass();
@@ -114,7 +114,7 @@ namespace Avalonia.Win32.Interop.Wpf
             if (_finalSize == _previousSize)
                 return finalSize;
             _previousSize = _finalSize;
-            _ttl.Resized?.Invoke(finalSize.ToAvaloniaSize());
+            _ttl.Resized?.Invoke(finalSize.ToAvaloniaSize(), PlatformResizeReason.Unspecified);
             return base.ArrangeOverride(finalSize);
         }
 
@@ -236,7 +236,7 @@ namespace Avalonia.Win32.Interop.Wpf
 
         Action<RawInputEventArgs> ITopLevelImpl.Input { get; set; } //TODO
         Action<Rect> ITopLevelImpl.Paint { get; set; }
-        Action<Size> ITopLevelImpl.Resized { get; set; }
+        Action<Size, PlatformResizeReason> ITopLevelImpl.Resized { get; set; }
         Action<double> ITopLevelImpl.ScalingChanged { get; set; }
 
         Action<WindowTransparencyLevel> ITopLevelImpl.TransparencyLevelChanged { get; set; }
diff --git a/src/Windows/Avalonia.Win32/PopupImpl.cs b/src/Windows/Avalonia.Win32/PopupImpl.cs
index dd3fd1342c..38dc4a16dc 100644
--- a/src/Windows/Avalonia.Win32/PopupImpl.cs
+++ b/src/Windows/Avalonia.Win32/PopupImpl.cs
@@ -17,7 +17,7 @@ namespace Avalonia.Win32
         [ThreadStatic]
         private static IntPtr s_parentHandle;
 
-        public override void Show(bool activate)
+        public override void Show(bool activate, bool isDialog)
         {
             // Popups are always shown non-activated.
             UnmanagedMethods.ShowWindow(Handle.Handle, UnmanagedMethods.ShowWindowCommand.ShowNoActivate);
@@ -135,7 +135,7 @@ namespace Avalonia.Win32
         private void MoveResize(PixelPoint position, Size size, double scaling)
         {
             Move(position);
-            Resize(size);
+            Resize(size, PlatformResizeReason.Layout);
             //TODO: We ignore the scaling override for now
         }
 
diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index d92bd08d01..a881c45cd0 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -6,18 +6,16 @@ using System.IO;
 using System.Reactive.Disposables;
 using System.Runtime.InteropServices;
 using System.Threading;
-using Avalonia.Animation;
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Platform;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.OpenGL;
-using Avalonia.OpenGL.Egl;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Threading;
 using Avalonia.Utilities;
-using Avalonia.Win32;
 using Avalonia.Win32.Input;
 using Avalonia.Win32.Interop;
 using static Avalonia.Win32.Interop.UnmanagedMethods;
@@ -37,15 +35,46 @@ namespace Avalonia
         }
     }
 
+    /// <summary>
+    /// Platform-specific options which apply to Windows.
+    /// </summary>
     public class Win32PlatformOptions
     {
+        /// <summary>
+        /// Deferred renderer would be used when set to true. Immediate renderer when set to false. The default value is true.
+        /// </summary>
+        /// <remarks>
+        /// Avalonia has two rendering modes: Immediate and Deferred rendering.
+        /// Immediate re-renders the whole scene when some element is changed on the scene. Deferred re-renders only changed elements.
+        /// </remarks>
         public bool UseDeferredRendering { get; set; } = true;
-        
+
+        /// <summary>
+        /// Enables ANGLE for Windows. For every Windows version that is above Windows 7, the default is true otherwise it's false.
+        /// </summary>
+        /// <remarks>
+        /// GPU rendering will not be enabled if this is set to false.
+        /// </remarks>
         public bool? AllowEglInitialization { get; set; }
-        
-        public bool? EnableMultitouch { get; set; }
+
+        /// <summary>
+        /// Enables multitouch support. The default value is true.
+        /// </summary>
+        /// <remarks>
+        /// Multitouch allows a surface (a touchpad or touchscreen) to recognize the presence of more than one point of contact with the surface at the same time.
+        /// </remarks>
+        public bool? EnableMultitouch { get; set; } = true;
+
+        /// <summary>
+        /// Embeds popups to the window when set to true. The default value is false.
+        /// </summary>
         public bool OverlayPopups { get; set; }
+
+        /// <summary>
+        /// Avalonia would try to use native Widows OpenGL when set to true. The default value is false.
+        /// </summary>
         public bool UseWgl { get; set; }
+
         public IList<GlVersion> WglProfiles { get; set; } = new List<GlVersion>
         {
             new GlVersion(GlProfileType.OpenGL, 4, 0),
@@ -65,7 +94,7 @@ namespace Avalonia
 
 namespace Avalonia.Win32
 {
-    class Win32Platform : IPlatformThreadingInterface, IPlatformSettings, IWindowingPlatform, IPlatformIconLoader
+    class Win32Platform : IPlatformThreadingInterface, IPlatformSettings, IWindowingPlatform, IPlatformIconLoader, IPlatformLifetimeEventsImpl
     {
         private static readonly Win32Platform s_instance = new Win32Platform();
         private static Thread _uiThread;
@@ -112,10 +141,18 @@ namespace Avalonia.Win32
                 .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(60))
                 .Bind<ISystemDialogImpl>().ToSingleton<SystemDialogImpl>()
                 .Bind<IWindowingPlatform>().ToConstant(s_instance)
-                .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>()
+                .Bind<PlatformHotkeyConfiguration>().ToConstant(new PlatformHotkeyConfiguration(KeyModifiers.Control)
+                {
+                    OpenContextMenu =
+                    {
+                        // Add Shift+F10
+                        new KeyGesture(Key.F10, KeyModifiers.Shift)
+                    }
+                })
                 .Bind<IPlatformIconLoader>().ToConstant(s_instance)
                 .Bind<NonPumpingLockHelper.IHelperImpl>().ToConstant(new NonPumpingSyncContext.HelperImpl())
-                .Bind<IMountedVolumeInfoProvider>().ToConstant(new WindowsMountedVolumeInfoProvider());
+                .Bind<IMountedVolumeInfoProvider>().ToConstant(new WindowsMountedVolumeInfoProvider())
+                .Bind<IPlatformLifetimeEventsImpl>().ToConstant(s_instance);
 
             Win32GlManager.Initialize();
 
@@ -200,6 +237,8 @@ namespace Avalonia.Win32
 
         public event Action<DispatcherPriority?> Signaled;
 
+        public event EventHandler<ShutdownRequestedEventArgs> ShutdownRequested;
+
         [SuppressMessage("Microsoft.StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation", Justification = "Using Win32 naming for consistency.")]
         private IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
         {
@@ -207,6 +246,22 @@ namespace Avalonia.Win32
             {
                 Signaled?.Invoke(null);
             }
+
+            if(msg == (uint)WindowsMessage.WM_QUERYENDSESSION)
+            {
+                if (ShutdownRequested != null)
+                {
+                    var e = new ShutdownRequestedEventArgs();
+
+                    ShutdownRequested(this, e);
+
+                    if(e.Cancel)
+                    {
+                        return IntPtr.Zero;
+                    }
+                }
+            }
+
             return UnmanagedMethods.DefWindowProc(hWnd, msg, wParam, lParam);
         }
 
@@ -246,7 +301,7 @@ namespace Avalonia.Win32
         public IWindowImpl CreateEmbeddableWindow()
         {
             var embedded = new EmbeddedWindowImpl();
-            embedded.Show(true);
+            embedded.Show(true, false);
             return embedded;
         }
 
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
index 8e755a33bc..d163b3d068 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
@@ -2,9 +2,10 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 using Avalonia.Controls;
-using Avalonia.Controls.Platform;
+using Avalonia.Controls.Remote;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
+using Avalonia.Platform;
 using Avalonia.Win32.Input;
 using static Avalonia.Win32.Interop.UnmanagedMethods;
 
@@ -18,7 +19,6 @@ namespace Avalonia.Win32
         {
             const double wheelDelta = 120.0;
             uint timestamp = unchecked((uint)GetMessageTime());
-
             RawInputEventArgs e = null;
             var shouldTakeFocus = false;
 
@@ -94,14 +94,19 @@ namespace Avalonia.Win32
                         var newDisplayRect = Marshal.PtrToStructure<RECT>(lParam);
                         _scaling = dpi / 96.0;
                         ScalingChanged?.Invoke(_scaling);
-                        SetWindowPos(hWnd,
-                            IntPtr.Zero,
-                            newDisplayRect.left,
-                            newDisplayRect.top,
-                            newDisplayRect.right - newDisplayRect.left,
-                            newDisplayRect.bottom - newDisplayRect.top,
-                            SetWindowPosFlags.SWP_NOZORDER |
-                            SetWindowPosFlags.SWP_NOACTIVATE);
+                        
+                        using (SetResizeReason(PlatformResizeReason.DpiChange))
+                        { 
+                            SetWindowPos(hWnd,
+                                IntPtr.Zero,
+                                newDisplayRect.left,
+                                newDisplayRect.top,
+                                newDisplayRect.right - newDisplayRect.left,
+                                newDisplayRect.bottom - newDisplayRect.top,
+                                SetWindowPosFlags.SWP_NOZORDER |
+                                SetWindowPosFlags.SWP_NOACTIVATE);
+                        }
+
                         return IntPtr.Zero;
                     }
 
@@ -364,6 +369,11 @@ namespace Avalonia.Win32
                     return IntPtr.Zero;
                 }
 
+
+                case WindowsMessage.WM_ENTERSIZEMOVE:
+                    _resizeReason = PlatformResizeReason.User;
+                    break;
+
                 case WindowsMessage.WM_SIZE:
                     {
                         using(NonPumpingSyncContext.Use())
@@ -379,7 +389,7 @@ namespace Avalonia.Win32
                              size == SizeCommand.Maximized))
                         {
                             var clientSize = new Size(ToInt32(lParam) & 0xffff, ToInt32(lParam) >> 16);
-                            Resized(clientSize / RenderScaling);
+                            Resized(clientSize / RenderScaling, _resizeReason);
                         }
 
                         var windowState = size == SizeCommand.Maximized ?
@@ -403,6 +413,10 @@ namespace Avalonia.Win32
                         return IntPtr.Zero;
                     }
 
+                case WindowsMessage.WM_EXITSIZEMOVE:
+                    _resizeReason = PlatformResizeReason.Unspecified;
+                    break;
+
                 case WindowsMessage.WM_MOVE:
                     {
                         PositionChanged?.Invoke(new PixelPoint((short)(ToInt32(lParam) & 0xffff),
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 646a6f5739..0b7bd13082 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -53,6 +53,7 @@ namespace Avalonia.Win32
         private double _extendTitleBarHint = -1;
         private bool _isUsingComposition;
         private IBlurHost _blurHost;
+        private PlatformResizeReason _resizeReason;
 
 #if USE_MANAGED_DRAG
         private readonly ManagedWindowResizeDragHelper _managedDrag;
@@ -160,7 +161,7 @@ namespace Avalonia.Win32
 
         public Action<Rect> Paint { get; set; }
 
-        public Action<Size> Resized { get; set; }
+        public Action<Size, PlatformResizeReason> Resized { get; set; }
 
         public Action<double> ScalingChanged { get; set; }
 
@@ -450,7 +451,7 @@ namespace Avalonia.Win32
                     value.Y,
                     0,
                     0,
-                    SetWindowPosFlags.SWP_NOSIZE | SetWindowPosFlags.SWP_NOACTIVATE);
+                    SetWindowPosFlags.SWP_NOSIZE | SetWindowPosFlags.SWP_NOACTIVATE | SetWindowPosFlags.SWP_NOZORDER);
             }
         }
 
@@ -482,7 +483,7 @@ namespace Avalonia.Win32
                 : new ImmediateRenderer(root);
         }
 
-        public void Resize(Size value)
+        public void Resize(Size value, PlatformResizeReason reason)
         {
             int requestedClientWidth = (int)(value.Width * RenderScaling);
             int requestedClientHeight = (int)(value.Height * RenderScaling);
@@ -494,6 +495,7 @@ namespace Avalonia.Win32
             {
                 GetWindowRect(_hwnd, out var windowRect);
 
+                using var scope = SetResizeReason(reason);
                 SetWindowPos(
                     _hwnd,
                     IntPtr.Zero,
@@ -585,7 +587,7 @@ namespace Avalonia.Win32
             _shown = false;
         }
 
-        public virtual void Show(bool activate)
+        public virtual void Show(bool activate, bool isDialog)
         {
             SetParent(_parent);
             ShowWindow(_showWindowState, activate);
@@ -930,7 +932,7 @@ namespace Avalonia.Win32
                 _offScreenMargin = new Thickness();
                 _extendedMargins = new Thickness();
                 
-                Resize(new Size(rcWindow.Width/ RenderScaling, rcWindow.Height / RenderScaling));
+                Resize(new Size(rcWindow.Width/ RenderScaling, rcWindow.Height / RenderScaling), PlatformResizeReason.Layout);
             }
 
             if(!_isClientAreaExtended || (_extendChromeHints.HasAllFlags(ExtendClientAreaChromeHints.SystemChrome) &&
@@ -1135,7 +1137,7 @@ namespace Avalonia.Win32
                         SetParent(null);
 
                         if (shown)
-                            Show(activated);
+                            Show(activated, false);
                     }
                 }
                 else
@@ -1311,6 +1313,13 @@ namespace Avalonia.Win32
         /// <inheritdoc/>
         public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; } = new AcrylicPlatformCompensationLevels(1, 0.8, 0);
 
+        private ResizeReasonScope SetResizeReason(PlatformResizeReason reason)
+        {
+            var old = _resizeReason;
+            _resizeReason = reason;
+            return new ResizeReasonScope(this, old);
+        }
+
         private struct SavedWindowInfo
         {
             public WindowStyles Style { get; set; }
@@ -1325,5 +1334,19 @@ namespace Avalonia.Win32
             public SystemDecorations Decorations;
             public bool IsFullScreen;
         }
+
+        private struct ResizeReasonScope : IDisposable
+        {
+            private readonly WindowImpl _owner;
+            private readonly PlatformResizeReason _restore;
+            
+            public ResizeReasonScope(WindowImpl owner, PlatformResizeReason restore)
+            {
+                _owner = owner;
+                _restore = restore;
+            }
+
+            public void Dispose() => _owner._resizeReason = _restore;
+        }
     }
 }
diff --git a/src/iOS/Avalonia.iOS/AvaloniaView.cs b/src/iOS/Avalonia.iOS/AvaloniaView.cs
index 0371a7759a..5bb2f64879 100644
--- a/src/iOS/Avalonia.iOS/AvaloniaView.cs
+++ b/src/iOS/Avalonia.iOS/AvaloniaView.cs
@@ -96,7 +96,7 @@ namespace Avalonia.iOS
             public IEnumerable<object> Surfaces { get; set; }
             public Action<RawInputEventArgs> Input { get; set; }
             public Action<Rect> Paint { get; set; }
-            public Action<Size> Resized { get; set; }
+            public Action<Size, PlatformResizeReason> Resized { get; set; }
             public Action<double> ScalingChanged { get; set; }
             public Action<WindowTransparencyLevel> TransparencyLevelChanged { get; set; }
             public Action Closed { get; set; }
@@ -127,7 +127,7 @@ namespace Avalonia.iOS
 
         public override void LayoutSubviews()
         {
-            _topLevelImpl.Resized?.Invoke(_topLevelImpl.ClientSize);
+            _topLevelImpl.Resized?.Invoke(_topLevelImpl.ClientSize, PlatformResizeReason.Layout);
             base.LayoutSubviews();
         }
 
diff --git a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
index f3a1316c7d..ba01f3db40 100644
--- a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
@@ -1,11 +1,12 @@
 using System;
+
+using Avalonia.Controls.Primitives;
 using Avalonia.Input;
-using Avalonia.LogicalTree;
 using Avalonia.Markup.Xaml;
-using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Platform;
+using Avalonia.Rendering;
 using Avalonia.UnitTests;
-using Castle.DynamicProxy.Generators;
+
 using Moq;
 using Xunit;
 
@@ -16,6 +17,107 @@ namespace Avalonia.Controls.UnitTests
         private Mock<IPopupImpl> popupImpl;
         private MouseTestHelper _mouse = new MouseTestHelper();
 
+        [Fact]
+        public void ContextRequested_Opens_ContextMenu()
+        {
+            using (Application())
+            {
+                var sut = new ContextMenu();
+                var target = new Panel
+                {
+                    ContextMenu = sut
+                };
+
+                var window = new Window { Content = target };
+                window.ApplyTemplate();
+                window.Presenter.ApplyTemplate();
+
+                int openedCount = 0;
+
+                sut.MenuOpened += (sender, args) =>
+                {
+                    openedCount++;
+                };
+
+                target.RaiseEvent(new ContextRequestedEventArgs());
+
+                Assert.True(sut.IsOpen);
+                Assert.Equal(1, openedCount);
+            }
+        }
+
+        [Fact]
+        public void ContextMenu_Is_Opened_When_ContextFlyout_Is_Also_Set()
+        {
+            // We have this test for backwards compatability with the code that already sets custom ContextMenu.
+            using (Application())
+            {
+                var sut = new ContextMenu();
+                var flyout = new Flyout();
+                var target = new Panel
+                {
+                    ContextMenu = sut,
+                    ContextFlyout = flyout
+                };
+
+                var window = new Window { Content = target };
+                window.ApplyTemplate();
+                window.Presenter.ApplyTemplate();
+
+                target.RaiseEvent(new ContextRequestedEventArgs());
+
+                Assert.True(sut.IsOpen);
+                Assert.False(flyout.IsOpen);
+            }
+        }
+
+        [Fact]
+        public void KeyUp_Raised_On_Target_Opens_ContextFlyout()
+        {
+            using (Application())
+            {
+                var sut = new ContextMenu();
+                var target = new Panel
+                {
+                    ContextMenu = sut
+                };
+                var contextRequestedCount = 0;
+                target.AddHandler(Control.ContextRequestedEvent, (s, a) => contextRequestedCount++, Interactivity.RoutingStrategies.Tunnel);
+
+                var window = PreparedWindow(target);
+                window.Show();
+
+                target.RaiseEvent(new KeyEventArgs { RoutedEvent = InputElement.KeyUpEvent, Key = Key.Apps, Source = window });
+
+                Assert.True(sut.IsOpen);
+                Assert.Equal(1, contextRequestedCount);
+            }
+        }
+
+        [Fact]
+        public void KeyUp_Raised_On_Flyout_Closes_Opened_ContextMenu()
+        {
+            using (Application())
+            {
+                var sut = new ContextMenu();
+                var target = new Panel
+                {
+                    ContextMenu = sut
+                };
+
+                var window = PreparedWindow(target);
+                window.Show();
+
+                target.RaiseEvent(new ContextRequestedEventArgs());
+
+                Assert.True(sut.IsOpen);
+
+                sut.RaiseEvent(new KeyEventArgs { RoutedEvent = InputElement.KeyUpEvent, Key = Key.Apps, Source = window });
+
+                Assert.False(sut.IsOpen);
+            }
+        }
+
         [Fact]
         public void Opening_Raises_Single_Opened_Event()
         {
@@ -123,12 +225,97 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Cancel_Light_Dismiss_Closing_Keeps_Flyout_Open()
+        {
+            using (Application())
+            {
+                popupImpl.Setup(x => x.Show(true, false)).Verifiable();
+                popupImpl.Setup(x => x.Hide()).Verifiable();
+
+                var window = PreparedWindow();
+                window.Width = 100;
+                window.Height = 100;
+
+                var button = new Button
+                {
+                    Height = 10,
+                    Width = 10,
+                    HorizontalAlignment = Layout.HorizontalAlignment.Left,
+                    VerticalAlignment = Layout.VerticalAlignment.Top
+                };
+                window.Content = button;
+
+                window.ApplyTemplate();
+                window.Show();
+
+                var tracker = 0;
+
+                var c = new ContextMenu();
+                c.ContextMenuClosing += (s, e) =>
+                {
+                    tracker++;
+                    e.Cancel = true;
+                };
+                button.ContextMenu = c;
+                c.Open(button);
+
+                var overlay = LightDismissOverlayLayer.GetLightDismissOverlayLayer(window);
+                _mouse.Down(overlay, MouseButton.Left, new Point(90, 90));
+                _mouse.Up(button, MouseButton.Left, new Point(90, 90));
+
+                Assert.Equal(1, tracker);
+                Assert.True(c.IsOpen);
+
+                popupImpl.Verify(x => x.Hide(), Times.Never);
+                popupImpl.Verify(x => x.Show(true, false), Times.Exactly(1));
+            }
+        }
+
+        [Fact]
+        public void Light_Dismiss_Closes_Flyout()
+        {
+            using (Application())
+            {
+                popupImpl.Setup(x => x.Show(true, false)).Verifiable();
+                popupImpl.Setup(x => x.Hide()).Verifiable();
+
+                var window = PreparedWindow();
+                window.Width = 100;
+                window.Height = 100;
+
+                var button = new Button
+                {
+                    Height = 10,
+                    Width = 10,
+                    HorizontalAlignment = Layout.HorizontalAlignment.Left,
+                    VerticalAlignment = Layout.VerticalAlignment.Top
+                };
+                window.Content = button;
+
+                window.ApplyTemplate();
+                window.Show();
+
+                var c = new ContextMenu();
+                c.PlacementMode = PlacementMode.Bottom;
+                c.Open(button);
+
+                var overlay = LightDismissOverlayLayer.GetLightDismissOverlayLayer(window);
+                _mouse.Down(overlay, MouseButton.Left, new Point(90, 90));
+                _mouse.Up(button, MouseButton.Left, new Point(90, 90));
+
+                Assert.False(c.IsOpen);
+                popupImpl.Verify(x => x.Hide(), Times.Exactly(1));
+                popupImpl.Verify(x => x.Show(true, false), Times.Exactly(1));
+            }
+        }
+
         [Fact]
         public void Clicking_On_Control_Toggles_ContextMenu()
         {
             using (Application())
             {
-                popupImpl.Setup(x => x.Show(true)).Verifiable();
+                popupImpl.Setup(x => x.Show(true, false)).Verifiable();
                 popupImpl.Setup(x => x.Hide()).Verifiable();
 
                 var sut = new ContextMenu();
@@ -137,18 +324,19 @@ namespace Avalonia.Controls.UnitTests
                     ContextMenu = sut
                 };
 
-                var window = new Window {Content = target};
-                window.ApplyTemplate();
-                window.Presenter.ApplyTemplate();
+                var window = PreparedWindow(target);
+                window.Show();
+                var overlay = LightDismissOverlayLayer.GetLightDismissOverlayLayer(window);
 
                 _mouse.Click(target, MouseButton.Right);
 
                 Assert.True(sut.IsOpen);
 
-                _mouse.Click(target);
+                _mouse.Down(overlay);
+                _mouse.Up(target);
 
                 Assert.False(sut.IsOpen);
-                popupImpl.Verify(x => x.Show(true), Times.Once);
+                popupImpl.Verify(x => x.Show(true, false), Times.Once);
                 popupImpl.Verify(x => x.Hide(), Times.Once);
             }
         }
@@ -158,7 +346,7 @@ namespace Avalonia.Controls.UnitTests
         {
             using (Application())
             {
-                popupImpl.Setup(x => x.Show(true)).Verifiable();
+                popupImpl.Setup(x => x.Show(true, false)).Verifiable();
                 popupImpl.Setup(x => x.Hide()).Verifiable();
 
                 var sut = new ContextMenu();
@@ -167,19 +355,20 @@ namespace Avalonia.Controls.UnitTests
                     ContextMenu = sut
                 };
 
-                var window = new Window {Content = target};
-                window.ApplyTemplate();
-                window.Presenter.ApplyTemplate();
+                var window = PreparedWindow(target);
+                window.Show();
 
-                _mouse.Click(target, MouseButton.Right);
+                var overlay = LightDismissOverlayLayer.GetLightDismissOverlayLayer(window);
 
+                _mouse.Click(target, MouseButton.Right);
                 Assert.True(sut.IsOpen);
 
-                _mouse.Click(target, MouseButton.Right);
+                _mouse.Down(overlay, MouseButton.Right);
+                _mouse.Up(target, MouseButton.Right);
 
                 Assert.True(sut.IsOpen);
                 popupImpl.Verify(x => x.Hide(), Times.Once);
-                popupImpl.Verify(x => x.Show(true), Times.Exactly(2));
+                popupImpl.Verify(x => x.Show(true, false), Times.Exactly(2));
             }
         }
         
@@ -209,12 +398,10 @@ namespace Avalonia.Controls.UnitTests
 
                 Assert.True(sut.IsOpen);
 
-                _mouse.Click(target2, MouseButton.Left);
-                
-                Assert.False(sut.IsOpen);
-                
                 sp.Children.Remove(target1);
-                
+
+                Assert.False(sut.IsOpen);
+
                 _mouse.Click(target2, MouseButton.Right);
                 
                 Assert.True(sut.IsOpen);
@@ -226,7 +413,7 @@ namespace Avalonia.Controls.UnitTests
         {
             using (Application())
             {
-                popupImpl.Setup(x => x.Show(true)).Verifiable();
+                popupImpl.Setup(x => x.Show(true, false)).Verifiable();
 
                 bool eventCalled = false;
                 var sut = new ContextMenu();
@@ -242,7 +429,7 @@ namespace Avalonia.Controls.UnitTests
 
                 Assert.True(eventCalled);
                 Assert.False(sut.IsOpen);
-                popupImpl.Verify(x => x.Show(true), Times.Never);
+                popupImpl.Verify(x => x.Show(true, false), Times.Never);
             }
         }
 
@@ -341,12 +528,12 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        [Fact(Skip = "The only reason this test was 'passing' before was that the author forgot to call Window.ApplyTemplate()")]
+        [Fact]
         public void Cancelling_Closing_Leaves_ContextMenuOpen()
         {
             using (Application())
             {
-                popupImpl.Setup(x => x.Show(true)).Verifiable();
+                popupImpl.Setup(x => x.Show(true, false)).Verifiable();
                 popupImpl.Setup(x => x.Hide()).Verifiable();
 
                 bool eventCalled = false;
@@ -355,26 +542,42 @@ namespace Avalonia.Controls.UnitTests
                 {
                     ContextMenu = sut
                 };
-                
-                var window = new Window {Content = target};
-                window.ApplyTemplate();
+
+                var window = PreparedWindow(target);
+                var overlay = LightDismissOverlayLayer.GetLightDismissOverlayLayer(window);
 
                 sut.ContextMenuClosing += (c, e) => { eventCalled = true; e.Cancel = true; };
 
+                window.Show();
+
                 _mouse.Click(target, MouseButton.Right);
 
                 Assert.True(sut.IsOpen);
 
-                _mouse.Click(target, MouseButton.Right);
+                _mouse.Down(overlay, MouseButton.Right);
+                _mouse.Up(target, MouseButton.Right);
 
                 Assert.True(eventCalled);
                 Assert.True(sut.IsOpen);
 
-                popupImpl.Verify(x => x.Show(true), Times.Once());
+                popupImpl.Verify(x => x.Show(true, false), Times.Once());
                 popupImpl.Verify(x => x.Hide(), Times.Never);
             }
         }
 
+        private Window PreparedWindow(object content = null)
+        {
+            var renderer = new Mock<IRenderer>();
+            var platform = AvaloniaLocator.Current.GetService<IWindowingPlatform>();
+            var windowImpl = Mock.Get(platform.CreateWindow());
+            windowImpl.Setup(x => x.CreateRenderer(It.IsAny<IRenderRoot>())).Returns(renderer.Object);
+
+            var w = new Window(windowImpl.Object) { Content = content };
+            w.ApplyTemplate();
+            w.Presenter.ApplyTemplate();
+            return w;
+        }
+
         private IDisposable Application()
         {
             var screen = new PixelRect(new PixelPoint(), new PixelSize(100, 100));
diff --git a/tests/Avalonia.Controls.UnitTests/DesktopStyleApplicationLifetimeTests.cs b/tests/Avalonia.Controls.UnitTests/DesktopStyleApplicationLifetimeTests.cs
index 84f02aeda5..f7a3bdea1c 100644
--- a/tests/Avalonia.Controls.UnitTests/DesktopStyleApplicationLifetimeTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/DesktopStyleApplicationLifetimeTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Platform;
 using Avalonia.Threading;
@@ -209,6 +210,33 @@ namespace Avalonia.Controls.UnitTests
                 Assert.Empty(lifetime.Windows);
             }
         }
+
+        [Fact]
+        public void Should_Allow_Canceling_Shutdown_Via_ShutdownRequested_Event()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            using (var lifetime = new ClassicDesktopStyleApplicationLifetime())
+            {
+                var lifetimeEvents = new Mock<IPlatformLifetimeEventsImpl>();
+                AvaloniaLocator.CurrentMutable.Bind<IPlatformLifetimeEventsImpl>().ToConstant(lifetimeEvents.Object);
+                lifetime.Start(Array.Empty<string>());
+
+                var window = new Window();
+                var raised = 0;
+
+                window.Show();
+
+                lifetime.ShutdownRequested += (s, e) =>
+                {
+                    e.Cancel = true;
+                    ++raised;
+                };
+
+                lifetimeEvents.Raise(x => x.ShutdownRequested += null, new ShutdownRequestedEventArgs());
+
+                Assert.Equal(1, raised);
+                Assert.Equal(new[] { window }, lifetime.Windows);
+            }
+        }
     }
-    
 }
diff --git a/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs b/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs
index 0dce73180e..c2dd8cf01a 100644
--- a/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs
@@ -1,10 +1,18 @@
 using System;
+using System.ComponentModel;
 using System.Linq;
+
+using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
+
+using Moq;
+
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
@@ -28,6 +36,7 @@ namespace Avalonia.Controls.UnitTests
                 f.ShowAt(window);
 
                 Assert.Equal(1, tracker);
+                Assert.True(f.IsOpen);
             }
         }
 
@@ -51,6 +60,31 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Opening_Is_Cancellable()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+                window.Show();
+
+                int tracker = 0;
+                Flyout f = new Flyout();
+                f.Opening += (s, e) =>
+                {
+                    tracker++;
+                    if (e is CancelEventArgs cancelEventArgs)
+                    {
+                        cancelEventArgs.Cancel = true;
+                    }
+                };
+                f.ShowAt(window);
+
+                Assert.Equal(1, tracker);
+                Assert.False(f.IsOpen);
+            }
+        }
+
         [Fact]
         public void Closing_Raises_Single_Closing_Event()
         {
@@ -101,16 +135,89 @@ namespace Avalonia.Controls.UnitTests
                 var window = PreparedWindow();
                 window.Show();
 
-                int tracker = 0;
-                Flyout f = new Flyout();
+                var tracker = 0;
+                var f = new Flyout();
                 f.Closing += (s, e) =>
                 {
+                    tracker++;
                     e.Cancel = true;
                 };
                 f.ShowAt(window);
                 f.Hide();
 
                 Assert.True(f.IsOpen);
+                Assert.Equal(1, tracker);
+            }
+        }
+
+        [Fact]
+        public void Cancel_Light_Dismiss_Closing_Keeps_Flyout_Open()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+                window.Width = 100;
+                window.Height = 100;
+
+                var button = new Button
+                {
+                    Height = 10,
+                    Width = 10,
+                    HorizontalAlignment = Layout.HorizontalAlignment.Left,
+                    VerticalAlignment = Layout.VerticalAlignment.Top
+                };
+                window.Content = button;
+
+                window.Show();
+
+                var tracker = 0;
+                var f = new Flyout();
+                f.Content = new Border { Width = 10, Height = 10 };
+                f.Closing += (s, e) =>
+                {
+                    tracker++;
+                    e.Cancel = true;
+                };
+                f.ShowAt(window);
+
+                var e = CreatePointerPressedEventArgs(window, new Point(90, 90));
+                var overlay = LightDismissOverlayLayer.GetLightDismissOverlayLayer(window);
+                overlay.RaiseEvent(e);
+
+                Assert.Equal(1, tracker);
+                Assert.True(f.IsOpen);
+            }
+        }
+
+        [Fact]
+        public void Light_Dismiss_Closes_Flyout()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+                window.Width = 100;
+                window.Height = 100;
+
+                var button = new Button
+                {
+                    Height = 10,
+                    Width = 10,
+                    HorizontalAlignment = Layout.HorizontalAlignment.Left,
+                    VerticalAlignment = Layout.VerticalAlignment.Top
+                };
+                window.Content = button;
+
+                window.Show();
+
+                var f = new Flyout();
+                f.Content = new Border { Width = 10, Height = 10 };
+                f.ShowAt(window);
+
+                var e = CreatePointerPressedEventArgs(window, new Point(90, 90));
+                var overlay = LightDismissOverlayLayer.GetLightDismissOverlayLayer(window);
+                overlay.RaiseEvent(e);
+
+                Assert.False(f.IsOpen);
             }
         }
 
@@ -222,6 +329,109 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void ContextRequested_Opens_ContextFlyout()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var flyout = new Flyout();
+                var target = new Panel
+                {
+                    ContextFlyout = flyout
+                };
+
+                var window = PreparedWindow(target);
+                window.Show();
+
+                int openedCount = 0;
+
+                flyout.Opened += (sender, args) =>
+                {
+                    openedCount++;
+                };
+
+                target.RaiseEvent(new ContextRequestedEventArgs());
+
+                Assert.True(flyout.IsOpen);
+                Assert.Equal(1, openedCount);
+            }
+        }
+
+        [Fact]
+        public void KeyUp_Raised_On_Target_Opens_ContextFlyout()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var flyout = new Flyout();
+                var target = new Panel
+                {
+                    ContextFlyout = flyout
+                };
+                var contextRequestedCount = 0;
+                target.AddHandler(Control.ContextRequestedEvent, (s, a) => contextRequestedCount++, Interactivity.RoutingStrategies.Tunnel);
+
+                var window = PreparedWindow(target);
+                window.Show();
+
+                target.RaiseEvent(new KeyEventArgs { RoutedEvent = InputElement.KeyUpEvent, Key = Key.Apps, Source = window });
+
+                Assert.True(flyout.IsOpen);
+                Assert.Equal(1, contextRequestedCount);
+            }
+        }
+
+        [Fact]
+        public void KeyUp_Raised_On_Target_Closes_Opened_ContextFlyout()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var flyout = new Flyout();
+                var target = new Panel
+                {
+                    ContextFlyout = flyout
+                };
+
+                var window = PreparedWindow(target);
+                window.Show();
+
+                target.RaiseEvent(new ContextRequestedEventArgs());
+
+                Assert.True(flyout.IsOpen);
+
+                target.RaiseEvent(new KeyEventArgs { RoutedEvent = InputElement.KeyUpEvent, Key = Key.Apps, Source = window });
+
+                Assert.False(flyout.IsOpen);
+            }
+        }
+
+        [Fact]
+        public void KeyUp_Raised_On_Flyout_Closes_Opened_ContextFlyout()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var flyoutContent = new Button();
+                var flyout = new Flyout()
+                {
+                    Content = flyoutContent
+                };
+                var target = new Panel
+                {
+                    ContextFlyout = flyout
+                };
+
+                var window = PreparedWindow(target);
+                window.Show();
+
+                target.RaiseEvent(new ContextRequestedEventArgs());
+
+                Assert.True(flyout.IsOpen);
+
+                flyoutContent.RaiseEvent(new KeyEventArgs { RoutedEvent = InputElement.KeyUpEvent, Key = Key.Apps, Source = window });
+
+                Assert.False(flyout.IsOpen);
+            }
+        }
+
         [Fact]
         public void ContextFlyout_Can_Be_Set_In_Styles()
         {
@@ -317,9 +527,27 @@ namespace Avalonia.Controls.UnitTests
 
         private Window PreparedWindow(object content = null)
         {
-            var w = new Window { Content = content };
+            var renderer = new Mock<IRenderer>();
+            var platform = AvaloniaLocator.Current.GetService<IWindowingPlatform>();
+            var windowImpl = Mock.Get(platform.CreateWindow());
+            windowImpl.Setup(x => x.CreateRenderer(It.IsAny<IRenderRoot>())).Returns(renderer.Object);
+
+            var w = new Window(windowImpl.Object) { Content = content };
             w.ApplyTemplate();
             return w;
         }
+
+        private PointerPressedEventArgs CreatePointerPressedEventArgs(Window source, Point p)
+        {
+            var pointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
+            return new PointerPressedEventArgs(
+                source,
+                pointer,
+                source,
+                p,
+                0,
+                new PointerPointProperties(RawInputModifiers.None, PointerUpdateKind.LeftButtonPressed),
+                KeyModifiers.None);
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
index 64c0020f92..cb20071860 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
@@ -8,6 +8,7 @@ using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
+using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.UnitTests;
@@ -556,6 +557,31 @@ namespace Avalonia.Controls.UnitTests
                 Assert.True(true);
             }
         }
+        
+        [Theory]
+        [InlineData(Key.Up)]
+        [InlineData(Key.Down)]
+        [InlineData(Key.Home)]
+        [InlineData(Key.End)]
+        public void Textbox_doesnt_crash_when_Receives_input_and_template_not_applied(Key key)
+        {
+            using (UnitTestApplication.Start(FocusServices))
+            {
+                var target1 = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "1234",
+                    IsVisible = false
+                };
+
+                var root = new TestRoot { Child = target1 };
+
+                target1.Focus();
+                Assert.True(target1.IsFocused);
+                
+                RaiseKeyEvent(target1, key, KeyModifiers.None);
+            }
+        }
 
         [Fact]
         public void TextBox_GotFocus_And_LostFocus_Work_Properly()
@@ -763,6 +789,9 @@ namespace Avalonia.Controls.UnitTests
             keyboardDevice: () => new KeyboardDevice(),
             keyboardNavigation: new KeyboardNavigationHandler(),
             inputManager: new InputManager(),
+            renderInterface: new MockPlatformRenderInterface(),
+            fontManagerImpl: new MockFontManagerImpl(),
+            textShaperImpl: new MockTextShaperImpl(),
             standardCursorFactory: Mock.Of<ICursorFactory>());
 
         private static TestServices Services => TestServices.MockThreadingInterface.With(
diff --git a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
index 6b30aed257..9c2d760733 100644
--- a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
@@ -139,7 +139,7 @@ namespace Avalonia.Controls.UnitTests
 
                 // The user has resized the window, so we can no longer auto-size.
                 var target = new TestTopLevel(impl.Object);
-                impl.Object.Resized(new Size(100, 200));
+                impl.Object.Resized(new Size(100, 200), PlatformResizeReason.Unspecified);
 
                 Assert.Equal(100, target.Width);
                 Assert.Equal(200, target.Height);
diff --git a/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs b/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs
index 8109b037c5..1b4214e0c7 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs
@@ -137,7 +137,7 @@ namespace Avalonia.Controls.UnitTests
                 var target = new TestWindowBase(windowImpl.Object);
                 target.IsVisible = true;
 
-                windowImpl.Verify(x => x.Show(true));
+                windowImpl.Verify(x => x.Show(true, false));
             }
         }
 
diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
index 6b9921d83d..eb128ef038 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
@@ -663,10 +663,11 @@ namespace Avalonia.Controls.UnitTests
                     var clientSize = new Size(200, 200);
                     var maxClientSize = new Size(480, 480);
 
-                    windowImpl.Setup(x => x.Resize(It.IsAny<Size>())).Callback<Size>(size =>
+                    windowImpl.Setup(x => x.Resize(It.IsAny<Size>(), It.IsAny<PlatformResizeReason>()))
+                        .Callback<Size, PlatformResizeReason>((size, reason) =>
                     {
                         clientSize = size.Constrain(maxClientSize);
-                        windowImpl.Object.Resized?.Invoke(clientSize);
+                        windowImpl.Object.Resized?.Invoke(clientSize, reason);
                     });
 
                     windowImpl.Setup(x => x.ClientSize).Returns(() => clientSize);
@@ -739,6 +740,36 @@ namespace Avalonia.Controls.UnitTests
                 }
             }
 
+            [Fact]
+            public void SizeToContent_Should_Not_Be_Lost_On_Scaling_Change()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var child = new Canvas
+                    {
+                        Width = 209,
+                        Height = 117,
+                    };
+
+                    var target = new Window()
+                    {
+                        SizeToContent = SizeToContent.WidthAndHeight,
+                        Content = child
+                    };
+
+                    Show(target);
+
+                    // Size before and after DPI change is a real-world example, with size after DPI
+                    // change coming from Win32 WM_DPICHANGED.
+                    target.PlatformImpl.ScalingChanged(1.5);
+                    target.PlatformImpl.Resized(
+                        new Size(210.66666666666666, 118.66666666666667),
+                        PlatformResizeReason.DpiChange);
+
+                    Assert.Equal(SizeToContent.WidthAndHeight, target.SizeToContent);
+                }
+            }
+
             [Fact]
             public void Width_Height_Should_Be_Updated_When_SizeToContent_Is_WidthAndHeight()
             {
@@ -791,8 +822,91 @@ namespace Avalonia.Controls.UnitTests
                     target.LayoutManager.ExecuteLayoutPass();
 
                     var windowImpl = Mock.Get(target.PlatformImpl);
-                    windowImpl.Verify(x => x.Resize(new Size(410, 800)));
+                    windowImpl.Verify(x => x.Resize(new Size(410, 800), PlatformResizeReason.Application));
+                    Assert.Equal(410, target.Width);
+                }
+            }
+
+
+            [Fact]
+            public void User_Resize_Of_Window_Width_Should_Reset_SizeToContent()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var target = new Window()
+                    {
+                        SizeToContent = SizeToContent.WidthAndHeight,
+                        Content = new Canvas
+                        {
+                            Width = 400,
+                            Height = 800,
+                        },
+                    };
+
+                    Show(target);
+                    Assert.Equal(400, target.Width);
+                    Assert.Equal(800, target.Height);
+
+                    target.PlatformImpl.Resized(new Size(410, 800), PlatformResizeReason.User);
+
                     Assert.Equal(410, target.Width);
+                    Assert.Equal(800, target.Height);
+                    Assert.Equal(SizeToContent.Height, target.SizeToContent);
+                }
+            }
+
+            [Fact]
+            public void User_Resize_Of_Window_Height_Should_Reset_SizeToContent()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var target = new Window()
+                    {
+                        SizeToContent = SizeToContent.WidthAndHeight,
+                        Content = new Canvas
+                        {
+                            Width = 400,
+                            Height = 800,
+                        },
+                    };
+
+                    Show(target);
+                    Assert.Equal(400, target.Width);
+                    Assert.Equal(800, target.Height);
+
+                    target.PlatformImpl.Resized(new Size(400, 810), PlatformResizeReason.User);
+
+                    Assert.Equal(400, target.Width);
+                    Assert.Equal(810, target.Height);
+                    Assert.Equal(SizeToContent.Width, target.SizeToContent);
+                }
+            }
+
+            [Fact]
+            public void Window_Resize_Should_Not_Reset_SizeToContent_If_CanResize_False()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var target = new Window()
+                    {
+                        SizeToContent = SizeToContent.WidthAndHeight,
+                        CanResize = false,
+                        Content = new Canvas
+                        {
+                            Width = 400,
+                            Height = 800,
+                        },
+                    };
+
+                    Show(target);
+                    Assert.Equal(400, target.Width);
+                    Assert.Equal(800, target.Height);
+
+                    target.PlatformImpl.Resized(new Size(410, 810), PlatformResizeReason.Unspecified);
+
+                    Assert.Equal(400, target.Width);
+                    Assert.Equal(800, target.Height);
+                    Assert.Equal(SizeToContent.WidthAndHeight, target.SizeToContent);
                 }
             }
 
diff --git a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Custom.cs b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Custom.cs
index f72d6ba9c9..f9c85ee4ca 100644
--- a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Custom.cs
+++ b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Custom.cs
@@ -95,6 +95,7 @@ namespace Avalonia.Input.UnitTests
 
             var root = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     target,
@@ -125,6 +126,7 @@ namespace Avalonia.Input.UnitTests
 
             var root = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     (current = new Button { Content = "Outside" }),
@@ -137,6 +139,36 @@ namespace Avalonia.Input.UnitTests
             Assert.Same(next, result);
         }
 
+        [Fact]
+        public void ShiftTab_Should_Navigate_Outside_When_Null_Returned_As_Next()
+        {
+            Button current;
+            Button next;
+            var target = new CustomNavigatingStackPanel
+            {
+                Children =
+                {
+                    new Button { Content = "Button 1" },
+                    (current = new Button { Content = "Button 2" }),
+                    new Button { Content = "Button 3" },
+                },
+            };
+
+            var root = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    target,
+                    (next = new Button { Content = "Outside" }),
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Same(next, result);
+        }
+
         [Fact]
         public void Tab_Should_Navigate_Outside_When_Null_Returned_As_Next()
         {
@@ -154,6 +186,7 @@ namespace Avalonia.Input.UnitTests
 
             var root = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     target,
diff --git a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
index 1efbbed2e8..edcbf75a1d 100644
--- a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
+++ b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Avalonia.Controls;
 using Xunit;
 
@@ -13,6 +14,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -49,6 +51,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -85,6 +88,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -122,6 +126,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -165,6 +170,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -193,6 +199,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -222,6 +229,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -263,6 +271,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     (next = new Button { Name = "Button1" }),
@@ -282,6 +291,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -324,6 +334,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -361,6 +372,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -398,6 +410,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -434,6 +447,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -471,6 +485,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -509,6 +524,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     (container = new StackPanel
@@ -548,6 +564,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -586,6 +603,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     (container = new StackPanel
@@ -625,6 +643,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -661,6 +680,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -697,6 +717,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -725,6 +746,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -767,6 +789,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -828,6 +851,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -865,6 +889,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -902,6 +927,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -938,6 +964,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -975,6 +1002,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -1013,6 +1041,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     (container = new StackPanel
@@ -1052,6 +1081,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                 Children =
                 {
                     new StackPanel
@@ -1103,5 +1133,97 @@ namespace Avalonia.Input.UnitTests
 
             Assert.Null(result);
         }
+
+        [Fact]
+        public void Respects_TabIndex_Moving_Forwards()
+        {
+            Button start;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1", TabIndex = 5 },
+                            (start = new Button { Name = "Button2", TabIndex = 2 }),
+                            new Button { Name = "Button3", TabIndex = 1 },
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4", TabIndex = 3  },
+                            new Button { Name = "Button5", TabIndex = 6  },
+                            new Button { Name = "Button6", TabIndex = 4  },
+                        }
+                    },
+                }
+            };
+
+            var result = new List<string>();
+            var current = (IInputElement)start;
+
+            do
+            {
+                result.Add(((IControl)current).Name);
+                current = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+            } while (current is object && current != start);
+
+            Assert.Equal(new[]
+            {
+                "Button2", "Button4", "Button6", "Button1", "Button5", "Button3"
+            }, result);
+        }
+
+        [Fact]
+        public void Respects_TabIndex_Moving_Backwards()
+        {
+            Button start;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1", TabIndex = 5 },
+                            (start = new Button { Name = "Button2", TabIndex = 2 }),
+                            new Button { Name = "Button3", TabIndex = 1 },
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4", TabIndex = 3  },
+                            new Button { Name = "Button5", TabIndex = 6  },
+                            new Button { Name = "Button6", TabIndex = 4  },
+                        }
+                    },
+                }
+            };
+
+            var result = new List<string>();
+            var current = (IInputElement)start;
+
+            do
+            {
+                result.Add(((IControl)current).Name);
+                current = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+            } while (current is object && current != start);
+
+            Assert.Equal(new[]
+            {
+                "Button2", "Button3", "Button5", "Button1", "Button6", "Button4"
+            }, result);
+        }
     }
 }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs
index 6f549a4ffa..8a61458030 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs
@@ -938,6 +938,110 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             }
         }
 
+        [Fact]
+        public void SupportsEmptyPath()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+        x:DataType='local:TestDataContext'>
+    <TextBlock Text='{CompiledBinding}' Name='textBlock' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                var dataContext = new TestDataContext
+                {
+                    StringProperty = "foobar"
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(typeof(TestDataContext).FullName, textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void SupportsEmptyPathWithStringFormat()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+        x:DataType='local:TestDataContext'>
+    <TextBlock Text='{CompiledBinding StringFormat=bar-\{0\}}' Name='textBlock' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                var dataContext = new TestDataContext
+                {
+                    StringProperty = "foobar"
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal("bar-" + typeof(TestDataContext).FullName, textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void SupportsDotPath()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+        x:DataType='local:TestDataContext'>
+    <TextBlock Text='{CompiledBinding .}' Name='textBlock' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                var dataContext = new TestDataContext
+                {
+                    StringProperty = "foobar"
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(typeof(TestDataContext).FullName, textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void SupportsExplicitDotPathWithStringFormat()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+        x:DataType='local:TestDataContext'>
+    <TextBlock Text='{CompiledBinding Path=., StringFormat=bar-\{0\}}' Name='textBlock' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                var dataContext = new TestDataContext
+                {
+                    StringProperty = "foobar"
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal("bar-" + typeof(TestDataContext).FullName, textBlock.Text);
+            }
+        }
+
         void Throws(string type, Action cb)
         {
             try
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs
index 9c2a1953f1..a19f97e74e 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Avalonia.Media;
 using Avalonia.Media.TextFormatting;
 using Avalonia.Media.TextFormatting.Unicode;
@@ -203,6 +204,40 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 Assert.Equal(expectedNumberOfLines, numberOfLines);
             }
         }
+        
+        [Fact]
+        public void Should_Wrap_RightToLeft()
+        {
+            using (Start())
+            {
+                const string text =
+                    "قطاعات الصناعة على الشبكة العالمية انترنيت ويونيكود، حيث ستتم، على الصعيدين الدولي والمحلي على حد سواء";
+                
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+
+                var textSource = new SingleBufferTextSource(text, defaultProperties);
+
+                var formatter = new TextFormatterImpl();
+
+                var currentTextSourceIndex = 0;
+
+                while (currentTextSourceIndex < text.Length)
+                {
+                    var textLine =
+                        formatter.FormatLine(textSource, currentTextSourceIndex, 50,
+                            new GenericTextParagraphProperties(defaultProperties, textWrap: TextWrapping.Wrap));
+
+                    var glyphClusters = textLine.TextRuns.Cast<ShapedTextCharacters>()
+                        .SelectMany(x => x.GlyphRun.GlyphClusters).ToArray();
+                
+                    Assert.True(glyphClusters[0] >= glyphClusters[^1]);
+                    
+                    Assert.Equal(currentTextSourceIndex, glyphClusters[^1]);
+
+                    currentTextSourceIndex += textLine.TextRange.Length;
+                }
+            }
+        }
 
         [InlineData("Whether to turn off HTTPS. This option only applies if Individual, " +
                     "IndividualB2C, SingleOrg, or MultiOrg aren't used for &#8209;&#8209;auth."
diff --git a/tests/Avalonia.UnitTests/MockWindowingPlatform.cs b/tests/Avalonia.UnitTests/MockWindowingPlatform.cs
index 8a24a8366f..bc003537f4 100644
--- a/tests/Avalonia.UnitTests/MockWindowingPlatform.cs
+++ b/tests/Avalonia.UnitTests/MockWindowingPlatform.cs
@@ -52,13 +52,14 @@ namespace Avalonia.UnitTests
                 windowImpl.Object.PositionChanged?.Invoke(x);
             });
 
-            windowImpl.Setup(x => x.Resize(It.IsAny<Size>())).Callback<Size>(x =>
+            windowImpl.Setup(x => x.Resize(It.IsAny<Size>(), It.IsAny<PlatformResizeReason>()))
+                .Callback<Size, PlatformResizeReason>((x, y) =>
             {
                 clientSize = x.Constrain(s_screenSize);
-                windowImpl.Object.Resized?.Invoke(clientSize);
+                windowImpl.Object.Resized?.Invoke(clientSize, y);
             });
 
-            windowImpl.Setup(x => x.Show(true)).Callback(() =>
+            windowImpl.Setup(x => x.Show(true, It.IsAny<bool>())).Callback(() =>
             {
                 windowImpl.Object.Activated?.Invoke();
             });
@@ -75,7 +76,7 @@ namespace Avalonia.UnitTests
             {
                 clientSize = size.Constrain(s_screenSize);
                 popupImpl.Object.PositionChanged?.Invoke(pos);
-                popupImpl.Object.Resized?.Invoke(clientSize);
+                popupImpl.Object.Resized?.Invoke(clientSize, PlatformResizeReason.Unspecified);
             });
             
             var positioner = new ManagedPopupPositioner(positionerHelper);
diff --git a/tests/Avalonia.UnitTests/TestRoot.cs b/tests/Avalonia.UnitTests/TestRoot.cs
index b69bf990d9..4601dd7e5b 100644
--- a/tests/Avalonia.UnitTests/TestRoot.cs
+++ b/tests/Avalonia.UnitTests/TestRoot.cs
@@ -21,6 +21,7 @@ namespace Avalonia.UnitTests
             Renderer = Mock.Of<IRenderer>();
             LayoutManager = new LayoutManager(this);
             IsVisible = true;
+            KeyboardNavigation.SetTabNavigation(this, KeyboardNavigationMode.Cycle);
         }
 
         public TestRoot(IControl child)
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
index 42e573c8a5..e317b43efc 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
@@ -245,6 +245,34 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             }
         }
 
+        [Fact]
+        public void Should_Respect_Uniform_ZIndex()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Panel panel;
+
+                var tree = new TestRoot
+                {
+                    Child = panel = new Panel()
+                };
+
+                for (var i = 0; i < 128; i++)
+                {
+                    panel.Children.Add(new Border());
+                }
+
+                var result = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(result);
+
+                var panelNode = result.FindNode(tree.Child);
+                var expected = panel.Children.ToArray();
+                var actual = panelNode.Children.OfType<IVisualNode>().Select(x => x.Visual).ToArray();
+                Assert.Equal(expected, actual);
+            }
+        }
+
         [Fact]
         public void ClipBounds_Should_Be_In_Global_Coordinates()
         {
diff --git a/tests/TestFiles/Skia/Controls/CustomRender/GeometryClip.expected.png b/tests/TestFiles/Skia/Controls/CustomRender/GeometryClip.expected.png
index 535d411cc7..e2604d2836 100644
Binary files a/tests/TestFiles/Skia/Controls/CustomRender/GeometryClip.expected.png and b/tests/TestFiles/Skia/Controls/CustomRender/GeometryClip.expected.png differ
diff --git a/tests/TestFiles/Skia/GeometryClipping/Geometry_Clip_Clips_Path.expected.png b/tests/TestFiles/Skia/GeometryClipping/Geometry_Clip_Clips_Path.expected.png
index 5993088a33..543226ac53 100644
Binary files a/tests/TestFiles/Skia/GeometryClipping/Geometry_Clip_Clips_Path.expected.png and b/tests/TestFiles/Skia/GeometryClipping/Geometry_Clip_Clips_Path.expected.png differ