diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py
index 13f2a569c1..438a7df732 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py
@@ -86,6 +86,7 @@ class TestLayerBlender(object):
     @pytest.mark.SUITE_periodic
     @pytest.mark.dynveg_area
     @pytest.mark.parametrize("launcher_platform", ['windows'])
+    @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/4170")
     def test_LayerBlender_E2E_Launcher(self, workspace, project, launcher, level, remote_console_instance,
                                        launcher_platform):
 
diff --git a/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui b/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui
index df7474d9d4..a345438aed 100644
--- a/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui
+++ b/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui
@@ -140,9 +140,6 @@
              <property name="horizontalScrollMode">
               <enum>QAbstractItemView::ScrollPerPixel</enum>
              </property>
-             <property name="showGrid">
-              <bool>false</bool>
-             </property>
              <property name="sortingEnabled">
               <bool>true</bool>
              </property>
@@ -201,6 +198,11 @@
    <header>AzToolsFramework/AssetBrowser/Search/SearchWidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>AzQtComponents::TableView</class>
+   <extends>QTreeView</extends>
+   <header>AzQtComponents/Components/Widgets/TableView.h</header>
+  </customwidget>
   <customwidget>
    <class>AzToolsFramework::AssetBrowser::AssetBrowserTreeView</class>
    <extends>QTreeView</extends>
@@ -214,7 +216,7 @@
   </customwidget>
   <customwidget>
    <class>AzToolsFramework::AssetBrowser::AssetBrowserTableView</class>
-   <extends>QTableView</extends>
+   <extends>AzQtComponents::TableView</extends>
    <header>AzToolsFramework/AssetBrowser/Views/AssetBrowserTableView.h</header>
   </customwidget>
  </customwidgets>
diff --git a/Code/Editor/Core/QtEditorApplication_linux.cpp b/Code/Editor/Core/QtEditorApplication_linux.cpp
index fa39609308..175bef0238 100644
--- a/Code/Editor/Core/QtEditorApplication_linux.cpp
+++ b/Code/Editor/Core/QtEditorApplication_linux.cpp
@@ -8,11 +8,21 @@
 
 #include "QtEditorApplication.h"
 
+#ifdef PAL_TRAIT_LINUX_WINDOW_MANAGER_XCB
+#include <AzFramework/API/ApplicationAPI_Linux.h>
+#endif
+
 namespace Editor
 {
-    bool EditorQtApplication::nativeEventFilter(const QByteArray& , void* , long* )
+    bool EditorQtApplication::nativeEventFilter([[maybe_unused]] const QByteArray& eventType, void* message, long*)
     {
-        // TODO_KDAB_LINUX
+        if (GetIEditor()->IsInGameMode())
+        {
+#ifdef PAL_TRAIT_LINUX_WINDOW_MANAGER_XCB
+            AzFramework::LinuxXcbEventHandlerBus::Broadcast(&AzFramework::LinuxXcbEventHandler::HandleXcbEvent, static_cast<xcb_generic_event_t*>(message));
+#endif
+            return true;
+        }
         return false;
     }
 }
diff --git a/Code/Editor/EditorToolsApplication.cpp b/Code/Editor/EditorToolsApplication.cpp
index 1e5d747e4a..26e608f657 100644
--- a/Code/Editor/EditorToolsApplication.cpp
+++ b/Code/Editor/EditorToolsApplication.cpp
@@ -34,10 +34,14 @@ namespace EditorInternal
         : ToolsApplication(argc, argv)
     {
         EditorToolsApplicationRequests::Bus::Handler::BusConnect();
+        AzToolsFramework::ViewportInteraction::EditorModifierKeyRequestBus::Handler::BusConnect();
+        AzToolsFramework::ViewportInteraction::EditorViewportInputTimeNowRequestBus::Handler::BusConnect();
     }
 
     EditorToolsApplication::~EditorToolsApplication()
     {
+        AzToolsFramework::ViewportInteraction::EditorViewportInputTimeNowRequestBus::Handler::BusDisconnect();
+        AzToolsFramework::ViewportInteraction::EditorModifierKeyRequestBus::Handler::BusDisconnect();
         EditorToolsApplicationRequests::Bus::Handler::BusDisconnect();
         Stop();
     }
@@ -48,7 +52,6 @@ namespace EditorInternal
         return m_StartupAborted;
     }
 
-
     void EditorToolsApplication::RegisterCoreComponents()
     {
         AzToolsFramework::ToolsApplication::RegisterCoreComponents();
@@ -274,5 +277,14 @@ namespace EditorInternal
         Exit();
     }
 
-}
+    AzToolsFramework::ViewportInteraction::KeyboardModifiers EditorToolsApplication::QueryKeyboardModifiers()
+    {
+        return AzToolsFramework::ViewportInteraction::BuildKeyboardModifiers(QGuiApplication::queryKeyboardModifiers());
+    }
 
+    AZStd::chrono::milliseconds EditorToolsApplication::EditorViewportInputTimeNow()
+    {
+        const auto now = AZStd::chrono::high_resolution_clock::now();
+        return AZStd::chrono::time_point_cast<AZStd::chrono::milliseconds>(now).time_since_epoch();
+    }
+} // namespace EditorInternal
diff --git a/Code/Editor/EditorToolsApplication.h b/Code/Editor/EditorToolsApplication.h
index 422772cbc4..d4e6223445 100644
--- a/Code/Editor/EditorToolsApplication.h
+++ b/Code/Editor/EditorToolsApplication.h
@@ -7,7 +7,9 @@
  */
 
 #pragma once
+
 #include <AzToolsFramework/Application/ToolsApplication.h>
+#include <AzToolsFramework/Viewport/ViewportMessages.h>
 
 #include "Core/EditorMetricsPlainTextNameRegistration.h"
 #include "EditorToolsApplicationAPI.h"
@@ -19,6 +21,8 @@ namespace EditorInternal
     class EditorToolsApplication
         : public AzToolsFramework::ToolsApplication
         , public EditorToolsApplicationRequests::Bus::Handler
+        , public AzToolsFramework::ViewportInteraction::EditorModifierKeyRequestBus::Handler
+        , public AzToolsFramework::ViewportInteraction::EditorViewportInputTimeNowRequestBus::Handler
     {
     public:
         EditorToolsApplication(int* argc, char*** argv);
@@ -44,6 +48,12 @@ namespace EditorInternal
         void CreateReflectionManager() override;
         void Reflect(AZ::ReflectContext* context) override;
 
+        // EditorModifierKeyRequestBus overrides ...
+        AzToolsFramework::ViewportInteraction::KeyboardModifiers QueryKeyboardModifiers() override;
+
+        // EditorViewportInputTimeNowRequestBus overrides ...
+        AZStd::chrono::milliseconds EditorViewportInputTimeNow() override;
+
     protected:
         // From EditorToolsApplicationRequests
         bool OpenLevel(AZStd::string_view levelName) override;
diff --git a/Code/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp
index 1ed901e514..5b5b52d28f 100644
--- a/Code/Editor/EditorViewportWidget.cpp
+++ b/Code/Editor/EditorViewportWidget.cpp
@@ -744,11 +744,15 @@ void EditorViewportWidget::RenderAll()
     {
         namespace AztfVi = AzToolsFramework::ViewportInteraction;
 
+        AztfVi::KeyboardModifiers keyboardModifiers;
+        AztfVi::EditorModifierKeyRequestBus::BroadcastResult(
+            keyboardModifiers, &AztfVi::EditorModifierKeyRequestBus::Events::QueryKeyboardModifiers);
+
         m_debugDisplay->DepthTestOff();
         m_manipulatorManager->DrawManipulators(
             *m_debugDisplay, GetCameraState(),
             BuildMouseInteractionInternal(
-                AztfVi::MouseButtons(AztfVi::TranslateMouseButtons(QGuiApplication::mouseButtons())), QueryKeyboardModifiers(),
+                AztfVi::MouseButtons(AztfVi::TranslateMouseButtons(QGuiApplication::mouseButtons())), keyboardModifiers,
                 BuildMousePick(WidgetToViewport(mapFromGlobal(QCursor::pos())))));
         m_debugDisplay->DepthTestOn();
     }
@@ -959,12 +963,13 @@ QWidget* EditorViewportWidget::GetWidgetForViewportContextMenu()
 
 bool EditorViewportWidget::ShowingWorldSpace()
 {
-    return QueryKeyboardModifiers().Shift();
-}
+    namespace AztfVi = AzToolsFramework::ViewportInteraction;
 
-AzToolsFramework::ViewportInteraction::KeyboardModifiers EditorViewportWidget::QueryKeyboardModifiers()
-{
-    return AzToolsFramework::ViewportInteraction::BuildKeyboardModifiers(QGuiApplication::queryKeyboardModifiers());
+    AztfVi::KeyboardModifiers keyboardModifiers;
+    AztfVi::EditorModifierKeyRequestBus::BroadcastResult(
+        keyboardModifiers, &AztfVi::EditorModifierKeyRequestBus::Events::QueryKeyboardModifiers);
+
+    return keyboardModifiers.Shift();
 }
 
 void EditorViewportWidget::SetViewportId(int id)
@@ -1039,7 +1044,6 @@ void EditorViewportWidget::ConnectViewportInteractionRequestBus()
 {
     AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler::BusConnect(GetViewportId());
     AzToolsFramework::ViewportInteraction::EditorEntityViewportInteractionRequestBus::Handler::BusConnect(GetViewportId());
-    AzToolsFramework::ViewportInteraction::EditorModifierKeyRequestBus::Handler::BusConnect();
     m_viewportUi.ConnectViewportUiBus(GetViewportId());
 
     AzFramework::InputSystemCursorConstraintRequestBus::Handler::BusConnect();
@@ -1050,7 +1054,6 @@ void EditorViewportWidget::DisconnectViewportInteractionRequestBus()
     AzFramework::InputSystemCursorConstraintRequestBus::Handler::BusDisconnect();
 
     m_viewportUi.DisconnectViewportUiBus();
-    AzToolsFramework::ViewportInteraction::EditorModifierKeyRequestBus::Handler::BusDisconnect();
     AzToolsFramework::ViewportInteraction::EditorEntityViewportInteractionRequestBus::Handler::BusDisconnect();
     AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler::BusDisconnect();
 }
diff --git a/Code/Editor/EditorViewportWidget.h b/Code/Editor/EditorViewportWidget.h
index 6b46524394..49930a2a13 100644
--- a/Code/Editor/EditorViewportWidget.h
+++ b/Code/Editor/EditorViewportWidget.h
@@ -92,7 +92,6 @@ class SANDBOX_API EditorViewportWidget final
     , private AzFramework::InputSystemCursorConstraintRequestBus::Handler
     , private AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler
     , private AzToolsFramework::ViewportInteraction::EditorEntityViewportInteractionRequestBus::Handler
-    , private AzToolsFramework::ViewportInteraction::EditorModifierKeyRequestBus::Handler
     , private AzFramework::AssetCatalogEventBus::Handler
     , private AZ::RPI::SceneNotificationBus::Handler
 {
@@ -212,9 +211,6 @@ private:
     // EditorEntityViewportInteractionRequestBus overrides ...
     void FindVisibleEntities(AZStd::vector<AZ::EntityId>& visibleEntities) override;
 
-    // EditorModifierKeyRequestBus overrides ...
-    AzToolsFramework::ViewportInteraction::KeyboardModifiers QueryKeyboardModifiers() override;
-
     // Camera::EditorCameraRequestBus overrides ...
     void SetViewFromEntityPerspective(const AZ::EntityId& entityId) override;
     void SetViewAndMovementLockFromEntityPerspective(const AZ::EntityId& entityId, bool lockCameraMovement) override;
diff --git a/Code/Editor/Include/IEditorClassFactory.h b/Code/Editor/Include/IEditorClassFactory.h
index 0827dc96dc..dd47f803e2 100644
--- a/Code/Editor/Include/IEditorClassFactory.h
+++ b/Code/Editor/Include/IEditorClassFactory.h
@@ -14,8 +14,10 @@
 #define CRYINCLUDE_EDITOR_INCLUDE_IEDITORCLASSFACTORY_H
 #pragma once
 
+#include <CryCommon/platform.h>
 #include <vector>
 #include <QtCore/QString>
+#include <AzCore/Math/Guid.h>
 
 #define DEFINE_UUID(l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
 static const GUID uuid() { return { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }; }
@@ -34,7 +36,7 @@ struct IUnknown
 #endif
 #define __uuidof(T) T::uuid()
 
-#if defined(AZ_PLATFORM_LINUX)
+#if defined(AZ_PLATFORM_LINUX) || defined(AZ_PLATFORM_MAC)
 
 # ifndef _REFGUID_DEFINED
 # define _REFGUID_DEFINED
@@ -65,7 +67,7 @@ enum
 };
 #endif
 
-#endif  // defined(AZ_PLATFORM_LINUX)
+#endif  // defined(AZ_PLATFORM_LINUX) || defined(AZ_PLATFORM_MAC)
 
 #include "SandboxAPI.h"
 
diff --git a/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp b/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
index c94d588a90..d2a81102dc 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
@@ -181,7 +181,7 @@ namespace AZ::IO::ArchiveInternal
             return 0;
         }
 
-        nTotal = (AZStd::min)(nTotal, GetFileSize() - m_nCurSeek);
+        nTotal = AZStd::min<size_t>(nTotal, GetFileSize() - m_nCurSeek);
 
         int64_t nReadBytes = GetFile()->ReadData(pDest, m_nCurSeek, nTotal);
         if (nReadBytes == -1)
diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.cpp
index b909689c22..1b3645630e 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.cpp
@@ -9,8 +9,19 @@
 #include <AzFramework/Viewport/ClickDetector.h>
 #include <AzFramework/Viewport/ScreenGeometry.h>
 
+#include <AzCore/std/chrono/clocks.h>
+
 namespace AzFramework
 {
+    ClickDetector::ClickDetector()
+    {
+        m_timeNowFn = []
+        {
+            const auto now = AZStd::chrono::high_resolution_clock::now();
+            return AZStd::chrono::time_point_cast<AZStd::chrono::milliseconds>(now).time_since_epoch();
+        };
+    }
+
     ClickDetector::ClickOutcome ClickDetector::DetectClick(const ClickEvent clickEvent, const ScreenVector& cursorDelta)
     {
         const auto previousDetectionState = m_detectionState;
@@ -26,11 +37,13 @@ namespace AzFramework
 
         if (clickEvent == ClickEvent::Down)
         {
-            const auto now = std::chrono::steady_clock::now();
+            const auto now = m_timeNowFn();
             if (m_tryBeginTime)
             {
-                const std::chrono::duration<float> diff = now - m_tryBeginTime.value();
-                if (diff.count() < m_doubleClickInterval)
+                using FloatingPointSeconds = AZStd::chrono::duration<float, AZStd::chrono::seconds::period>;
+
+                const auto diff = now - m_tryBeginTime.value();
+                if (FloatingPointSeconds(diff).count() < m_doubleClickInterval)
                 {
                     return ClickOutcome::Nil;
                 }
@@ -43,7 +56,8 @@ namespace AzFramework
         }
         else if (clickEvent == ClickEvent::Up)
         {
-            const auto clickOutcome = [detectionState = m_detectionState] {
+            const auto clickOutcome = [detectionState = m_detectionState]
+            {
                 if (detectionState == DetectionState::WaitingForMove)
                 {
                     return ClickOutcome::Click;
@@ -66,4 +80,9 @@ namespace AzFramework
 
         return ClickOutcome::Nil;
     }
+
+    void ClickDetector::OverrideTimeNowFn(AZStd::function<AZStd::chrono::milliseconds()> timeNowFn)
+    {
+        m_timeNowFn = AZStd::move(timeNowFn);
+    }
 } // namespace AzFramework
diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h b/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h
index f95924550a..70bdeb4619 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h
@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <AzCore/std/functional.h>
 #include <AzCore/std/optional.h>
 
 #include <chrono>
@@ -21,10 +22,9 @@ namespace AzFramework
     //! (mouse down with movement and then mouse up).
     class ClickDetector
     {
-        //! Alias for recording time of mouse down events
-        using Time = std::chrono::time_point<std::chrono::steady_clock>;
-
     public:
+        ClickDetector();
+
         //! Internal representation of click event (map from external event for this when
         //! calling DetectClick).
         enum class ClickEvent
@@ -51,6 +51,10 @@ namespace AzFramework
         void SetDoubleClickInterval(float doubleClickInterval);
         //! Override the dead zone before a 'move' outcome will be triggered.
         void SetDeadZone(float deadZone);
+        //! Override how the current time is retrieved.
+        //! This is helpful to override when it comes to simulating different passages of
+        //! time to avoid double click issues in tests for example.
+        void OverrideTimeNowFn(AZStd::function<AZStd::chrono::milliseconds()> timeNowFn);
 
     private:
         //! Internal state of ClickDetector based on incoming events.
@@ -65,7 +69,9 @@ namespace AzFramework
         float m_deadZone = 2.0f; //!< How far to move before a click is cancelled (when Move will fire).
         float m_doubleClickInterval = 0.4f; //!< Default double click interval, can be overridden.
         DetectionState m_detectionState; //!< Internal state of ClickDetector.
-        AZStd::optional<Time> m_tryBeginTime; //!< Mouse down time (happens each mouse down, helps with double click handling).
+        //! Mouse down time (happens each mouse down, helps with double click handling).
+        AZStd::optional<AZStd::chrono::milliseconds> m_tryBeginTime;
+        AZStd::function<AZStd::chrono::milliseconds()> m_timeNowFn; //!< Interface to query the current time.
     };
 
     inline void ClickDetector::SetDoubleClickInterval(const float doubleClickInterval)
diff --git a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_xcb.cpp b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_xcb.cpp
new file mode 100644
index 0000000000..8ff4c72d42
--- /dev/null
+++ b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_xcb.cpp
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/std/typetraits/integral_constant.h>
+#include <AzFramework/API/ApplicationAPI_Linux.h>
+#include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
+
+#define explicit ExplicitIsACXXKeyword
+#include <xcb/xkb.h>
+#undef explicit
+#include <xkbcommon/xkbcommon-keysyms.h>
+#include <xkbcommon/xkbcommon.h>
+#include <xkbcommon/xkbcommon-x11.h>
+
+namespace AzFramework
+{
+    class InputDeviceKeyboardXcb
+        : public InputDeviceKeyboard::Implementation
+        , public LinuxXcbEventHandlerBus::Handler
+    {
+    public:
+        AZ_CLASS_ALLOCATOR(InputDeviceKeyboardXcb, AZ::SystemAllocator, 0);
+
+        using InputDeviceKeyboard::Implementation::Implementation;
+        InputDeviceKeyboardXcb(InputDeviceKeyboard& inputDevice)
+            : InputDeviceKeyboard::Implementation(inputDevice)
+        {
+            LinuxXcbEventHandlerBus::Handler::BusConnect();
+
+            auto* interface = AzFramework::LinuxXcbConnectionManagerInterface::Get();
+            if (!interface)
+            {
+                AZ_Warning("ApplicationLinux", false, "XCB interface not available");
+                return;
+            }
+
+            auto* connection = AzFramework::LinuxXcbConnectionManagerInterface::Get()->GetXcbConnection();
+            if (!connection)
+            {
+                AZ_Warning("ApplicationLinux", false, "XCB connection not available");
+                return;
+            }
+
+            AZStd::unique_ptr<xcb_xkb_use_extension_reply_t, DeleterForFreeFn<::std::free>> xkbUseExtensionReply{
+                xcb_xkb_use_extension_reply(connection, xcb_xkb_use_extension(connection, 1, 0), nullptr)
+            };
+            if (!xkbUseExtensionReply)
+            {
+                AZ_Warning("ApplicationLinux", false, "Failed to initialize the xkb extension");
+                return;
+            }
+            if (!xkbUseExtensionReply->supported)
+            {
+                AZ_Warning("ApplicationLinux", false, "The X server does not support the xkb extension");
+                return;
+            }
+
+            m_coreDeviceId = xkb_x11_get_core_keyboard_device_id(connection);
+
+            m_xkbContext.reset(xkb_context_new(XKB_CONTEXT_NO_FLAGS));
+            m_xkbKeymap.reset(xkb_x11_keymap_new_from_device(m_xkbContext.get(), connection, m_coreDeviceId, XKB_KEYMAP_COMPILE_NO_FLAGS));
+            m_xkbState.reset(xkb_x11_state_new_from_device(m_xkbKeymap.get(), connection, m_coreDeviceId));
+
+            m_initialized = true;
+        }
+
+        bool IsConnected() const override
+        {
+            return m_initialized;
+        }
+
+        bool HasTextEntryStarted() const override
+        {
+            return false;
+        }
+
+        void TextEntryStart(const InputDeviceKeyboard::VirtualKeyboardOptions& options) override
+        {
+        }
+
+        void TextEntryStop() override
+        {
+        }
+
+        void TickInputDevice() override
+        {
+            ProcessRawEventQueues();
+        }
+
+        void HandleXcbEvent(xcb_generic_event_t* event) override
+        {
+            if (!IsConnected())
+            {
+                return;
+            }
+
+            switch (event->response_type & ~0x80)
+            {
+            case XCB_KEY_PRESS:
+            {
+                auto* keyPress = reinterpret_cast<xcb_key_press_event_t*>(event);
+
+                const InputChannelId* key = InputChannelFromKeyEvent(keyPress->detail);
+                if (key)
+                {
+                    QueueRawKeyEvent(*key, true);
+                }
+                break;
+            }
+            case XCB_KEY_RELEASE:
+            {
+                auto* keyRelease = reinterpret_cast<xcb_key_release_event_t*>(event);
+
+                const InputChannelId* key = InputChannelFromKeyEvent(keyRelease->detail);
+                if (key)
+                {
+                    QueueRawKeyEvent(*key, false);
+                }
+                break;
+            }
+            }
+        }
+
+    private:
+        [[nodiscard]] const InputChannelId* InputChannelFromKeyEvent(xcb_keycode_t code) const
+        {
+            const xcb_keysym_t keysym = xkb_state_key_get_one_sym(m_xkbState.get(), code);
+
+            switch(keysym)
+            {
+                case XKB_KEY_0: return &InputDeviceKeyboard::Key::Alphanumeric0;
+                case XKB_KEY_1: return &InputDeviceKeyboard::Key::Alphanumeric1;
+                case XKB_KEY_2: return &InputDeviceKeyboard::Key::Alphanumeric2;
+                case XKB_KEY_3: return &InputDeviceKeyboard::Key::Alphanumeric3;
+                case XKB_KEY_4: return &InputDeviceKeyboard::Key::Alphanumeric4;
+                case XKB_KEY_5: return &InputDeviceKeyboard::Key::Alphanumeric5;
+                case XKB_KEY_6: return &InputDeviceKeyboard::Key::Alphanumeric6;
+                case XKB_KEY_7: return &InputDeviceKeyboard::Key::Alphanumeric7;
+                case XKB_KEY_8: return &InputDeviceKeyboard::Key::Alphanumeric8;
+                case XKB_KEY_9: return &InputDeviceKeyboard::Key::Alphanumeric9;
+                case XKB_KEY_A:
+                case XKB_KEY_a: return &InputDeviceKeyboard::Key::AlphanumericA;
+                case XKB_KEY_B:
+                case XKB_KEY_b: return &InputDeviceKeyboard::Key::AlphanumericB;
+                case XKB_KEY_C:
+                case XKB_KEY_c: return &InputDeviceKeyboard::Key::AlphanumericC;
+                case XKB_KEY_D:
+                case XKB_KEY_d: return &InputDeviceKeyboard::Key::AlphanumericD;
+                case XKB_KEY_E:
+                case XKB_KEY_e: return &InputDeviceKeyboard::Key::AlphanumericE;
+                case XKB_KEY_F:
+                case XKB_KEY_f: return &InputDeviceKeyboard::Key::AlphanumericF;
+                case XKB_KEY_G:
+                case XKB_KEY_g: return &InputDeviceKeyboard::Key::AlphanumericG;
+                case XKB_KEY_H:
+                case XKB_KEY_h: return &InputDeviceKeyboard::Key::AlphanumericH;
+                case XKB_KEY_I:
+                case XKB_KEY_i: return &InputDeviceKeyboard::Key::AlphanumericI;
+                case XKB_KEY_J:
+                case XKB_KEY_j: return &InputDeviceKeyboard::Key::AlphanumericJ;
+                case XKB_KEY_K:
+                case XKB_KEY_k: return &InputDeviceKeyboard::Key::AlphanumericK;
+                case XKB_KEY_L:
+                case XKB_KEY_l: return &InputDeviceKeyboard::Key::AlphanumericL;
+                case XKB_KEY_M:
+                case XKB_KEY_m: return &InputDeviceKeyboard::Key::AlphanumericM;
+                case XKB_KEY_N:
+                case XKB_KEY_n: return &InputDeviceKeyboard::Key::AlphanumericN;
+                case XKB_KEY_O:
+                case XKB_KEY_o: return &InputDeviceKeyboard::Key::AlphanumericO;
+                case XKB_KEY_P:
+                case XKB_KEY_p: return &InputDeviceKeyboard::Key::AlphanumericP;
+                case XKB_KEY_Q:
+                case XKB_KEY_q: return &InputDeviceKeyboard::Key::AlphanumericQ;
+                case XKB_KEY_R:
+                case XKB_KEY_r: return &InputDeviceKeyboard::Key::AlphanumericR;
+                case XKB_KEY_S:
+                case XKB_KEY_s: return &InputDeviceKeyboard::Key::AlphanumericS;
+                case XKB_KEY_T:
+                case XKB_KEY_t: return &InputDeviceKeyboard::Key::AlphanumericT;
+                case XKB_KEY_U:
+                case XKB_KEY_u: return &InputDeviceKeyboard::Key::AlphanumericU;
+                case XKB_KEY_V:
+                case XKB_KEY_v: return &InputDeviceKeyboard::Key::AlphanumericV;
+                case XKB_KEY_W:
+                case XKB_KEY_w: return &InputDeviceKeyboard::Key::AlphanumericW;
+                case XKB_KEY_X:
+                case XKB_KEY_x: return &InputDeviceKeyboard::Key::AlphanumericX;
+                case XKB_KEY_Y:
+                case XKB_KEY_y: return &InputDeviceKeyboard::Key::AlphanumericY;
+                case XKB_KEY_Z:
+                case XKB_KEY_z: return &InputDeviceKeyboard::Key::AlphanumericZ;
+                case XKB_KEY_BackSpace: return &InputDeviceKeyboard::Key::EditBackspace;
+                case XKB_KEY_Caps_Lock: return &InputDeviceKeyboard::Key::EditCapsLock;
+                case XKB_KEY_Return: return &InputDeviceKeyboard::Key::EditEnter;
+                case XKB_KEY_space: return &InputDeviceKeyboard::Key::EditSpace;
+                case XKB_KEY_Tab: return &InputDeviceKeyboard::Key::EditTab;
+                case XKB_KEY_Escape: return &InputDeviceKeyboard::Key::Escape;
+                case XKB_KEY_F1: return &InputDeviceKeyboard::Key::Function01;
+                case XKB_KEY_F2: return &InputDeviceKeyboard::Key::Function02;
+                case XKB_KEY_F3: return &InputDeviceKeyboard::Key::Function03;
+                case XKB_KEY_F4: return &InputDeviceKeyboard::Key::Function04;
+                case XKB_KEY_F5: return &InputDeviceKeyboard::Key::Function05;
+                case XKB_KEY_F6: return &InputDeviceKeyboard::Key::Function06;
+                case XKB_KEY_F7: return &InputDeviceKeyboard::Key::Function07;
+                case XKB_KEY_F8: return &InputDeviceKeyboard::Key::Function08;
+                case XKB_KEY_F9: return &InputDeviceKeyboard::Key::Function09;
+                case XKB_KEY_F10: return &InputDeviceKeyboard::Key::Function10;
+                case XKB_KEY_F11: return &InputDeviceKeyboard::Key::Function11;
+                case XKB_KEY_F12: return &InputDeviceKeyboard::Key::Function12;
+                case XKB_KEY_F13: return &InputDeviceKeyboard::Key::Function13;
+                case XKB_KEY_F14: return &InputDeviceKeyboard::Key::Function14;
+                case XKB_KEY_F15: return &InputDeviceKeyboard::Key::Function15;
+                case XKB_KEY_F16: return &InputDeviceKeyboard::Key::Function16;
+                case XKB_KEY_F17: return &InputDeviceKeyboard::Key::Function17;
+                case XKB_KEY_F18: return &InputDeviceKeyboard::Key::Function18;
+                case XKB_KEY_F19: return &InputDeviceKeyboard::Key::Function19;
+                case XKB_KEY_F20: return &InputDeviceKeyboard::Key::Function20;
+                case XKB_KEY_Alt_L: return &InputDeviceKeyboard::Key::ModifierAltL;
+                case XKB_KEY_Alt_R: return &InputDeviceKeyboard::Key::ModifierAltR;
+                case XKB_KEY_Control_L: return &InputDeviceKeyboard::Key::ModifierCtrlL;
+                case XKB_KEY_Control_R: return &InputDeviceKeyboard::Key::ModifierCtrlR;
+                case XKB_KEY_Shift_L: return &InputDeviceKeyboard::Key::ModifierShiftL;
+                case XKB_KEY_Shift_R: return &InputDeviceKeyboard::Key::ModifierShiftR;
+                case XKB_KEY_Super_L: return &InputDeviceKeyboard::Key::ModifierSuperL;
+                case XKB_KEY_Super_R: return &InputDeviceKeyboard::Key::ModifierSuperR;
+                case XKB_KEY_Down: return &InputDeviceKeyboard::Key::NavigationArrowDown;
+                case XKB_KEY_Left: return &InputDeviceKeyboard::Key::NavigationArrowLeft;
+                case XKB_KEY_Right: return &InputDeviceKeyboard::Key::NavigationArrowRight;
+                case XKB_KEY_Up: return &InputDeviceKeyboard::Key::NavigationArrowUp;
+                case XKB_KEY_Delete: return &InputDeviceKeyboard::Key::NavigationDelete;
+                case XKB_KEY_End: return &InputDeviceKeyboard::Key::NavigationEnd;
+                case XKB_KEY_Home: return &InputDeviceKeyboard::Key::NavigationHome;
+                case XKB_KEY_Insert: return &InputDeviceKeyboard::Key::NavigationInsert;
+                case XKB_KEY_Page_Down: return &InputDeviceKeyboard::Key::NavigationPageDown;
+                case XKB_KEY_Page_Up: return &InputDeviceKeyboard::Key::NavigationPageUp;
+                case XKB_KEY_Num_Lock: return &InputDeviceKeyboard::Key::NumLock;
+                case XKB_KEY_KP_0: return &InputDeviceKeyboard::Key::NumPad0;
+                case XKB_KEY_KP_1: return &InputDeviceKeyboard::Key::NumPad1;
+                case XKB_KEY_KP_2: return &InputDeviceKeyboard::Key::NumPad2;
+                case XKB_KEY_KP_3: return &InputDeviceKeyboard::Key::NumPad3;
+                case XKB_KEY_KP_4: return &InputDeviceKeyboard::Key::NumPad4;
+                case XKB_KEY_KP_5: return &InputDeviceKeyboard::Key::NumPad5;
+                case XKB_KEY_KP_6: return &InputDeviceKeyboard::Key::NumPad6;
+                case XKB_KEY_KP_7: return &InputDeviceKeyboard::Key::NumPad7;
+                case XKB_KEY_KP_8: return &InputDeviceKeyboard::Key::NumPad8;
+                case XKB_KEY_KP_9: return &InputDeviceKeyboard::Key::NumPad9;
+                case XKB_KEY_KP_Add: return &InputDeviceKeyboard::Key::NumPadAdd;
+                case XKB_KEY_KP_Decimal: return &InputDeviceKeyboard::Key::NumPadDecimal;
+                case XKB_KEY_KP_Divide: return &InputDeviceKeyboard::Key::NumPadDivide;
+                case XKB_KEY_KP_Enter: return &InputDeviceKeyboard::Key::NumPadEnter;
+                case XKB_KEY_KP_Multiply: return &InputDeviceKeyboard::Key::NumPadMultiply;
+                case XKB_KEY_KP_Subtract: return &InputDeviceKeyboard::Key::NumPadSubtract;
+                case XKB_KEY_apostrophe: return &InputDeviceKeyboard::Key::PunctuationApostrophe;
+                case XKB_KEY_backslash: return &InputDeviceKeyboard::Key::PunctuationBackslash;
+                case XKB_KEY_bracketleft: return &InputDeviceKeyboard::Key::PunctuationBracketL;
+                case XKB_KEY_bracketright: return &InputDeviceKeyboard::Key::PunctuationBracketR;
+                case XKB_KEY_comma: return &InputDeviceKeyboard::Key::PunctuationComma;
+                case XKB_KEY_equal: return &InputDeviceKeyboard::Key::PunctuationEquals;
+                case XKB_KEY_hyphen: return &InputDeviceKeyboard::Key::PunctuationHyphen;
+                case XKB_KEY_period: return &InputDeviceKeyboard::Key::PunctuationPeriod;
+                case XKB_KEY_semicolon: return &InputDeviceKeyboard::Key::PunctuationSemicolon;
+                case XKB_KEY_slash: return &InputDeviceKeyboard::Key::PunctuationSlash;
+                case XKB_KEY_grave:
+                case XKB_KEY_asciitilde: return &InputDeviceKeyboard::Key::PunctuationTilde;
+                case XKB_KEY_ISO_Group_Shift: return &InputDeviceKeyboard::Key::SupplementaryISO;
+                case XKB_KEY_Pause: return &InputDeviceKeyboard::Key::WindowsSystemPause;
+                case XKB_KEY_Print: return &InputDeviceKeyboard::Key::WindowsSystemPrint;
+                case XKB_KEY_Scroll_Lock: return &InputDeviceKeyboard::Key::WindowsSystemScrollLock;
+                default: return nullptr;
+            }
+        }
+
+        template<auto freeFn>
+        using DeleterForFreeFn = AZStd::integral_constant<decltype(freeFn), freeFn>;
+
+        AZStd::unique_ptr<xkb_context, DeleterForFreeFn<xkb_context_unref>> m_xkbContext;
+        AZStd::unique_ptr<xkb_keymap, DeleterForFreeFn<xkb_keymap_unref>> m_xkbKeymap;
+        AZStd::unique_ptr<xkb_state, DeleterForFreeFn<xkb_state_unref>> m_xkbState;
+        int m_coreDeviceId{-1};
+        bool m_initialized{false};
+    };
+
+    InputDeviceKeyboard::Implementation* InputDeviceKeyboard::Implementation::Create(InputDeviceKeyboard& inputDevice)
+    {
+        return aznew InputDeviceKeyboardXcb(inputDevice);
+    }
+} // namespace AzFramework
diff --git a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Windowing/NativeWindow_Linux_xcb.cpp b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Windowing/NativeWindow_Linux_xcb.cpp
index 005c1858a3..cfc0222214 100644
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Windowing/NativeWindow_Linux_xcb.cpp
+++ b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Windowing/NativeWindow_Linux_xcb.cpp
@@ -62,8 +62,16 @@ namespace AzFramework
 
         uint32_t eventMask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK;
         
+        const uint32_t interestedEvents =
+            XCB_EVENT_MASK_STRUCTURE_NOTIFY
+            | XCB_EVENT_MASK_BUTTON_PRESS
+            | XCB_EVENT_MASK_BUTTON_RELEASE
+            | XCB_EVENT_MASK_KEY_PRESS
+            | XCB_EVENT_MASK_KEY_RELEASE
+            | XCB_EVENT_MASK_POINTER_MOTION
+            ;
         uint32_t valueList[] = { xcbRootScreen->black_pixel, 
-                                 XCB_EVENT_MASK_STRUCTURE_NOTIFY };
+                                 interestedEvents };
 
         xcb_void_cookie_t xcbCheckResult;
 
diff --git a/Code/Framework/AzFramework/Platform/Linux/platform_linux.cmake b/Code/Framework/AzFramework/Platform/Linux/platform_linux.cmake
index 4480f86c1d..dc77ca0abf 100644
--- a/Code/Framework/AzFramework/Platform/Linux/platform_linux.cmake
+++ b/Code/Framework/AzFramework/Platform/Linux/platform_linux.cmake
@@ -11,10 +11,16 @@
 if (${PAL_TRAIT_LINUX_WINDOW_MANAGER} STREQUAL "xcb")
 
     find_library(XCB_LIBRARY xcb)
+    find_library(XCB_XKB_LIBRARY xcb-xkb)
+    find_library(XKBCOMMON_LIBRARY xkbcommon)
+    find_library(XKBCOMMON_X11_LIBRARY xkbcommon-x11)
 
     set(LY_BUILD_DEPENDENCIES
         PRIVATE
             ${XCB_LIBRARY}
+            ${XKBCOMMON_LIBRARY}
+            ${XKBCOMMON_X11_LIBRARY}
+            ${XCB_XKB_LIBRARY}
     )
 
     set(LY_COMPILE_DEFINITIONS PUBLIC PAL_TRAIT_LINUX_WINDOW_MANAGER_XCB)
diff --git a/Code/Framework/AzFramework/Platform/Linux/platform_linux_files.cmake b/Code/Framework/AzFramework/Platform/Linux/platform_linux_files.cmake
index 4330675fc7..93767322b2 100644
--- a/Code/Framework/AzFramework/Platform/Linux/platform_linux_files.cmake
+++ b/Code/Framework/AzFramework/Platform/Linux/platform_linux_files.cmake
@@ -25,7 +25,7 @@ set(FILES
     AzFramework/Windowing/NativeWindow_Linux_xcb.h
     AzFramework/Windowing/NativeWindow_Linux_xcb.cpp
     ../Common/Unimplemented/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad_Unimplemented.cpp
-    ../Common/Unimplemented/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_Unimplemented.cpp
+    AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_xcb.cpp
     ../Common/Unimplemented/AzFramework/Input/Devices/Motion/InputDeviceMotion_Unimplemented.cpp
     ../Common/Unimplemented/AzFramework/Input/Devices/Mouse/InputDeviceMouse_Unimplemented.cpp
     ../Common/Unimplemented/AzFramework/Input/Devices/Touch/InputDeviceTouch_Unimplemented.cpp
diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h
index 7eddd8b915..5d1f606e8c 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h
@@ -18,6 +18,7 @@ namespace AzManipulatorTestFramework
     class ImmediateModeActionDispatcher
         : public ActionDispatcher<ImmediateModeActionDispatcher>
         , public AzToolsFramework::ViewportInteraction::EditorModifierKeyRequestBus::Handler
+        , public AzToolsFramework::ViewportInteraction::EditorViewportInputTimeNowRequestBus::Handler
     {
         using KeyboardModifier = AzToolsFramework::ViewportInteraction::KeyboardModifier;
         using KeyboardModifiers = AzToolsFramework::ViewportInteraction::KeyboardModifiers;
@@ -50,6 +51,9 @@ namespace AzManipulatorTestFramework
         // EditorModifierKeyRequestBus overrides ...
         KeyboardModifiers QueryKeyboardModifiers() override;
 
+        // EditorViewportInputTimeNowRequestBus overrides ...
+        AZStd::chrono::milliseconds EditorViewportInputTimeNow() override;
+
     protected:
         // ActionDispatcher ...
         void SetSnapToGridImpl(bool enabled) override;
@@ -79,6 +83,9 @@ namespace AzManipulatorTestFramework
 
         mutable AZStd::unique_ptr<MouseInteractionEvent> m_event;
         ManipulatorViewportInteraction& m_viewportManipulatorInteraction;
+
+        //! Current time that ticks up after each call to EditorViewportInputTimeNow.
+        AZStd::chrono::milliseconds m_timeNow = AZStd::chrono::milliseconds(0);
     };
 
     template<typename ActualT, typename ExpectedT>
@@ -106,4 +113,13 @@ namespace AzManipulatorTestFramework
     {
         return GetMouseInteractionEvent()->m_mouseInteraction.m_keyboardModifiers;
     }
+
+    inline AZStd::chrono::milliseconds ImmediateModeActionDispatcher::EditorViewportInputTimeNow()
+    {
+        // step the time for each call to be greater than the minimum time required for a double click to register
+        // note: the time increment is very high to ensure any potential system changes to settings such as double
+        // click interval will not be impacted
+        m_timeNow += AZStd::chrono::milliseconds(10000);
+        return m_timeNow;
+    }
 } // namespace AzManipulatorTestFramework
diff --git a/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp b/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp
index 08db7497f4..c122a941c4 100644
--- a/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp
@@ -33,10 +33,12 @@ namespace AzManipulatorTestFramework
         : m_viewportManipulatorInteraction(viewportManipulatorInteraction)
     {
         AzToolsFramework::ViewportInteraction::EditorModifierKeyRequestBus::Handler::BusConnect();
+        AzToolsFramework::ViewportInteraction::EditorViewportInputTimeNowRequestBus::Handler::BusConnect();
     }
 
     ImmediateModeActionDispatcher::~ImmediateModeActionDispatcher()
     {
+        AzToolsFramework::ViewportInteraction::EditorViewportInputTimeNowRequestBus::Handler::BusDisconnect();
         AzToolsFramework::ViewportInteraction::EditorModifierKeyRequestBus::Handler::BusDisconnect();
     }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTableView.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTableView.cpp
index 940d64fe94..37091c11e2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTableView.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTableView.cpp
@@ -28,16 +28,16 @@ namespace AzToolsFramework
     namespace AssetBrowser
     {
         AssetBrowserTableView::AssetBrowserTableView(QWidget* parent)
-            : QTableView(parent)
+            : AzQtComponents::TableView(parent)
             , m_delegate(new EntryDelegate(this))
         {
             setSortingEnabled(true);
             setItemDelegate(m_delegate);
-            verticalHeader()->hide();
+            setRootIsDecorated(false);
 
             //Styling the header aligning text to the left and using a bold font.
-            horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
-            horizontalHeader()->setStyleSheet("QHeaderView { font-weight: bold; }");
+            header()->setDefaultAlignment(Qt::AlignLeft);
+            header()->setStyleSheet("QHeaderView { font-weight: bold; }");
 
             setContextMenuPolicy(Qt::CustomContextMenu);
 
@@ -45,7 +45,7 @@ namespace AzToolsFramework
             setSortingEnabled(false);
             setSelectionMode(QAbstractItemView::SingleSelection);
 
-            connect(this, &QTableView::customContextMenuRequested, this, &AssetBrowserTableView::OnContextMenu);
+            connect(this, &AzQtComponents::TableView::customContextMenuRequested, this, &AssetBrowserTableView::OnContextMenu);
 
             AssetBrowserViewRequestBus::Handler::BusConnect();
             AssetBrowserComponentNotificationBus::Handler::BusConnect();
@@ -62,11 +62,11 @@ namespace AzToolsFramework
             m_tableModel = qobject_cast<AssetBrowserTableModel*>(model);
             AZ_Assert(m_tableModel, "Expecting AssetBrowserTableModel");
             m_sourceFilterModel = qobject_cast<AssetBrowserFilterModel*>(m_tableModel->sourceModel());
-            QTableView::setModel(model);
+            AzQtComponents::TableView::setModel(model);
             connect(m_tableModel, &AssetBrowserTableModel::layoutChanged, this, &AssetBrowserTableView::layoutChangedSlot);
 
-            horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeMode::Stretch);
-            horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeMode::Stretch);
+            header()->setSectionResizeMode(0, QHeaderView::ResizeMode::Stretch);
+            header()->setSectionResizeMode(1, QHeaderView::ResizeMode::Stretch);
         }
 
         void AssetBrowserTableView::SetName(const QString& name)
@@ -98,7 +98,7 @@ namespace AzToolsFramework
 
         void AssetBrowserTableView::selectionChanged(const QItemSelection& selected, const QItemSelection& deselected)
         {
-            QTableView::selectionChanged(selected, deselected);
+            AzQtComponents::TableView::selectionChanged(selected, deselected);
             Q_EMIT selectionChangedSignal(selected, deselected);
         }
 
@@ -115,7 +115,7 @@ namespace AzToolsFramework
                     selectionModel()->clear();
                 }
             }
-            QTableView::rowsAboutToBeRemoved(parent, start, end);
+            AzQtComponents::TableView::rowsAboutToBeRemoved(parent, start, end);
         }
 
         void AssetBrowserTableView::layoutChangedSlot(
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTableView.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTableView.h
index 5fbdab2ec5..94e9bdc4e4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTableView.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTableView.h
@@ -13,9 +13,10 @@
 #include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
 #include <AzToolsFramework/AssetBrowser/AssetBrowserTableModel.h>
 
+#include <AzQtComponents/Components/Widgets/TableView.h>
+
 #include <QModelIndex>
 #include <QPointer>
-#include <QTableView>
 #endif
 
 namespace AzToolsFramework
@@ -28,7 +29,7 @@ namespace AzToolsFramework
         class EntryDelegate;
 
         class AssetBrowserTableView //! Table view that displays the asset browser entries in a list.
-            : public QTableView
+            : public AzQtComponents::TableView
             , public AssetBrowserViewRequestBus::Handler
             , public AssetBrowserComponentNotificationBus::Handler
         {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
index c9438e640d..9d2f7e9b90 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
@@ -282,6 +282,24 @@ namespace AzToolsFramework
             return keyboardModifiers;
         }
 
+        //! An interface to deal with time requests relating to viewports.
+        //! @note The bus is global and not per viewport.
+        class EditorViewportInputTimeNowRequests : public AZ::EBusTraits
+        {
+        public:
+            static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+            static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+
+            //! Returns the current time in seconds.
+            //! This interface can be overridden for the purposes of testing to simplify viewport input requests.
+            virtual AZStd::chrono::milliseconds EditorViewportInputTimeNow() = 0;
+
+        protected:
+            ~EditorViewportInputTimeNowRequests() = default;
+        };
+
+        using EditorViewportInputTimeNowRequestBus = AZ::EBus<EditorViewportInputTimeNowRequests>;
+
         //! Viewport requests for managing the viewport cursor state.
         class ViewportMouseCursorRequests
         {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
index 5820eaafe1..27a77f9ce7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
@@ -253,10 +253,10 @@ namespace AzToolsFramework
                  mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl());
         }
 
-        static bool ManipulatorDitto(const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
+        static bool ManipulatorDitto(
+            const AzFramework::ClickDetector::ClickOutcome clickOutcome, const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
         {
-            return mouseInteraction.m_mouseEvent == ViewportInteraction::MouseEvent::Down &&
-                mouseInteraction.m_mouseInteraction.m_mouseButtons.Left() &&
+            return clickOutcome == AzFramework::ClickDetector::ClickOutcome::Click &&
                 mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl() &&
                 mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Alt();
         }
@@ -1054,6 +1054,17 @@ namespace AzToolsFramework
         RegisterActions();
         SetupBoxSelect();
         RefreshSelectedEntityIdsAndRegenerateManipulators();
+
+        // ensure the click detector uses the EditorViewportInputTimeNowRequests interface to retrieve elapsed time
+        // note: this is to facilitate overriding this functionality for purposes such as testing
+        m_clickDetector.OverrideTimeNowFn(
+            []
+            {
+                AZStd::chrono::milliseconds timeNow;
+                AzToolsFramework::ViewportInteraction::EditorViewportInputTimeNowRequestBus::BroadcastResult(
+                    timeNow, &AzToolsFramework::ViewportInteraction::EditorViewportInputTimeNowRequestBus::Events::EditorViewportInputTimeNow);
+                return timeNow;
+            });
     }
 
     EditorTransformComponentSelection::~EditorTransformComponentSelection()
@@ -1883,7 +1894,7 @@ namespace AzToolsFramework
             }
 
             // set manipulator pivot override translation or orientation (update manipulators)
-            if (Input::ManipulatorDitto(mouseInteraction))
+            if (Input::ManipulatorDitto(clickOutcome, mouseInteraction))
             {
                 PerformManipulatorDitto(entityIdUnderCursor);
                 return false;
diff --git a/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp
index c94e174108..449c4549be 100644
--- a/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp
@@ -783,7 +783,8 @@ namespace UnitTest
         const auto entity2ScreenPosition = AzFramework::WorldToScreen(m_entity2WorldTranslation, m_cameraState);
 
         // click the entity in the viewport
-        m_actionDispatcher->SetStickySelect(true)->CameraState(m_cameraState)
+        m_actionDispatcher->SetStickySelect(true)
+            ->CameraState(m_cameraState)
             ->MousePosition(entity2ScreenPosition)
             ->KeyboardModifierDown(AzToolsFramework::ViewportInteraction::KeyboardModifier::Control)
             ->MouseLButtonDown()
@@ -1018,6 +1019,105 @@ namespace UnitTest
         EXPECT_THAT(selectedEntitiesAfter, UnorderedElementsAre(m_entityId1));
     }
 
+    class EditorTransformComponentSelectionViewportPickingManipulatorTestFixtureParam
+        : public EditorTransformComponentSelectionViewportPickingManipulatorTestFixture
+        , public ::testing::WithParamInterface<bool>
+    {
+    };
+
+    TEST_P(
+        EditorTransformComponentSelectionViewportPickingManipulatorTestFixtureParam,
+        StickyAndUnstickyDittoManipulatorToOtherEntityChangesManipulatorAndDoesNotChangeSelection)
+    {
+        PositionEntities();
+        PositionCamera(m_cameraState);
+
+        AzToolsFramework::SelectEntity(m_entityId1);
+
+        // calculate the position in screen space of the second entity
+        const auto entity2ScreenPosition = AzFramework::WorldToScreen(m_entity2WorldTranslation, m_cameraState);
+
+        // single click select entity2
+        m_actionDispatcher->SetStickySelect(GetParam())
+            ->CameraState(m_cameraState)
+            ->MousePosition(entity2ScreenPosition)
+            ->KeyboardModifierDown(AzToolsFramework::ViewportInteraction::KeyboardModifier::Control)
+            ->KeyboardModifierDown(AzToolsFramework::ViewportInteraction::KeyboardModifier::Alt)
+            ->MouseLButtonDown()
+            ->MouseLButtonUp();
+
+        // entity1 is still selected
+        using ::testing::UnorderedElementsAre;
+        auto selectedEntitiesAfter = SelectedEntities();
+        EXPECT_THAT(selectedEntitiesAfter, UnorderedElementsAre(m_entityId1));
+
+        AZStd::optional<AZ::Transform> manipulatorTransform;
+        AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
+            manipulatorTransform, AzToolsFramework::GetEntityContextId(),
+            &AzToolsFramework::EditorTransformComponentSelectionRequestBus::Events::GetManipulatorTransform);
+
+        EXPECT_THAT(manipulatorTransform->GetTranslation(), IsClose(m_entity2WorldTranslation));
+    }
+
+    TEST_P(
+        EditorTransformComponentSelectionViewportPickingManipulatorTestFixtureParam,
+        StickyAndUnstickyDittoManipulatorToOtherEntityChangesManipulatorAndClickOffResetsManipulator)
+    {
+        PositionEntities();
+        PositionCamera(m_cameraState);
+
+        AzToolsFramework::SelectEntity(m_entityId1);
+
+        // calculate the position in screen space of the second entity
+        const auto entity2ScreenPosition = AzFramework::WorldToScreen(m_entity2WorldTranslation, m_cameraState);
+
+        // position in space above the entities
+        const auto clickOffPositionWorld = AZ::Vector3(5.0f, 15.0f, 12.0f);
+        // calculate the screen space position of the click
+        const auto clickOffPositionScreen = AzFramework::WorldToScreen(clickOffPositionWorld, m_cameraState);
+
+        using ::testing::UnorderedElementsAre;
+        // single click select entity2, then click off
+        m_actionDispatcher->SetStickySelect(GetParam())
+            ->CameraState(m_cameraState)
+            ->MousePosition(entity2ScreenPosition)
+            ->KeyboardModifierDown(AzToolsFramework::ViewportInteraction::KeyboardModifier::Control)
+            ->KeyboardModifierDown(AzToolsFramework::ViewportInteraction::KeyboardModifier::Alt)
+            ->MouseLButtonDown()
+            ->MouseLButtonUp()
+            ->ExecuteBlock(
+                [this]()
+                {
+                    auto selectedEntitiesAfter = SelectedEntities();
+                    EXPECT_THAT(selectedEntitiesAfter, UnorderedElementsAre(m_entityId1));
+
+                    AZStd::optional<AZ::Transform> manipulatorTransform;
+                    AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
+                        manipulatorTransform, AzToolsFramework::GetEntityContextId(),
+                        &AzToolsFramework::EditorTransformComponentSelectionRequestBus::Events::GetManipulatorTransform);
+
+                    EXPECT_THAT(manipulatorTransform->GetTranslation(), IsClose(m_entity2WorldTranslation));
+                })
+            ->MousePosition(clickOffPositionScreen)
+            ->KeyboardModifierDown(AzToolsFramework::ViewportInteraction::KeyboardModifier::Control)
+            ->KeyboardModifierDown(AzToolsFramework::ViewportInteraction::KeyboardModifier::Alt)
+            ->MouseLButtonDown()
+            ->MouseLButtonUp();
+
+        auto selectedEntitiesAfter = SelectedEntities();
+        EXPECT_THAT(selectedEntitiesAfter, UnorderedElementsAre(m_entityId1));
+
+        AZStd::optional<AZ::Transform> manipulatorTransform;
+        AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
+            manipulatorTransform, AzToolsFramework::GetEntityContextId(),
+            &AzToolsFramework::EditorTransformComponentSelectionRequestBus::Events::GetManipulatorTransform);
+
+        // manipulator transform is reset
+        EXPECT_THAT(manipulatorTransform->GetTranslation(), IsClose(m_entity1WorldTranslation));
+    }
+
+    INSTANTIATE_TEST_CASE_P(All, EditorTransformComponentSelectionViewportPickingManipulatorTestFixtureParam, testing::Values(true, false));
+
     using EditorTransformComponentSelectionManipulatorTestFixture =
         IndirectCallManipulatorViewportInteractionFixtureMixin<EditorTransformComponentSelectionFixture>;
 
diff --git a/Code/Tools/ProjectManager/Resources/Delete.svg b/Code/Tools/ProjectManager/Resources/Delete.svg
new file mode 100644
index 0000000000..f932c71544
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/Delete.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.33301 6H12.6663V14.6667H3.33301V6ZM5.33301 7.33333H6.66634V13.3333H5.33301V7.33333ZM10.6663 7.33333H9.33301V13.3333H10.6663V7.33333Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.6667 2H5.33333V3.33333H2V4.66667H14V3.33333H10.6667V2Z" fill="#E9E9E9"/>
+</svg>
diff --git a/Code/Tools/ProjectManager/Resources/Edit.svg b/Code/Tools/ProjectManager/Resources/Edit.svg
new file mode 100644
index 0000000000..3ee9bbbfae
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/Edit.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="2" y="2" width="1.33333" height="12" fill="white"/>
+<rect x="2" y="12.6666" width="12" height="1.33333" fill="white"/>
+<rect x="5.33301" y="9.20911" width="10.6667" height="2" transform="rotate(-45 5.33301 9.20911)" fill="white"/>
+<rect x="2" y="2" width="6.66667" height="1.33333" fill="white"/>
+<rect width="1.33333" height="6.66667" transform="matrix(-1 0 0 1 14 7.33337)" fill="white"/>
+</svg>
diff --git a/Code/Tools/ProjectManager/Resources/ProjectManager.qrc b/Code/Tools/ProjectManager/Resources/ProjectManager.qrc
index 2e93e9eca9..30bcc1ace5 100644
--- a/Code/Tools/ProjectManager/Resources/ProjectManager.qrc
+++ b/Code/Tools/ProjectManager/Resources/ProjectManager.qrc
@@ -35,5 +35,8 @@
         <file>Backgrounds/DefaultBackground.jpg</file>
         <file>Backgrounds/FtueBackground.jpg</file>
         <file>FeatureTagClose.svg</file>
+        <file>Refresh.svg</file>
+        <file>Edit.svg</file>
+        <file>Delete.svg</file>
     </qresource>
 </RCC>
diff --git a/Code/Tools/ProjectManager/Resources/ProjectManager.qss b/Code/Tools/ProjectManager/Resources/ProjectManager.qss
index 17c5077d83..30117d6636 100644
--- a/Code/Tools/ProjectManager/Resources/ProjectManager.qss
+++ b/Code/Tools/ProjectManager/Resources/ProjectManager.qss
@@ -518,3 +518,82 @@ QProgressBar::chunk {
     font-size: 12px;
     font-weight: 600;
 }
+
+/************** Engine **************/
+
+#engineTab::tab-bar {
+    left: 60px;
+}
+
+#engineTabBar::tab {
+    height: 50px;
+    background-color: transparent;
+    font-weight: 400;
+    font-size: 18px;
+    min-width: 160px;
+}
+
+#engineTabBar::tab:selected {
+    border-bottom: 3px solid #94D2FF;
+    color: #94D2FF;
+    font-weight: 600;
+}
+#engineTabBar::tab:hover {
+    color: #94D2FF;
+    font-weight: 600;
+}
+#engineTabBar::tab:pressed {
+    color: #66bcfa;
+}
+
+#engineTopFrame {
+    background-color:#1E252F;
+}
+
+/************** Gem Repo **************/
+
+#gemRepoHeaderLabel {
+    font-size: 12px;
+}
+
+#gemRepoHeaderRefreshButton {
+    background-color: transparent;
+    qproperty-flat: true;
+    qproperty-iconSize: 14px;
+}
+
+#gemRepoHeaderAddButton {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                            stop: 0 #888888, stop: 1.0 #555555);
+    qproperty-flat: true;
+    margin-right:30px;
+    min-width:120px;
+    max-width:120px;
+    min-height:24px;
+    max-height:24px;
+    border-radius: 3px;
+    text-align:center;
+    font-size:12px;
+    font-weight:600;
+}
+#gemRepoHeaderAddButton:hover {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                            stop: 0 #999999, stop: 1.0 #666666);
+}
+#gemRepoHeaderAddButton:pressed {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                            stop: 0 #555555, stop: 1.0 #777777);
+}
+
+#gemRepoHeaderTable {
+    background-color: transparent;
+    max-height: 30px;
+}
+
+#gemRepoListHeader {
+    background-color: transparent;
+}
+
+#gemRepoInspector {
+    background: #444444;
+}
diff --git a/Code/Tools/ProjectManager/Resources/Refresh.svg b/Code/Tools/ProjectManager/Resources/Refresh.svg
new file mode 100644
index 0000000000..80cc892c68
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/Refresh.svg
@@ -0,0 +1,4 @@
+<svg width="15" height="12" viewBox="0 0 15 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.046 5.85448C13.046 5.869 13.0436 5.66561 13.0436 5.68014H14.5278L12.3341 8.22252L10.1114 5.68014H11.6481C11.6481 5.66561 11.6513 5.869 11.6513 5.85448C11.6513 3.42833 9.77724 1.46707 7.46731 1.46707C6.42131 1.46707 5.46247 1.87385 4.73608 2.54213L3.8063 1.43801C4.79419 0.537286 6.07264 -0.000244141 7.46731 -0.000244141C10.5472 -0.000244141 13.046 2.6293 13.046 5.85448Z" fill="white"/>
+<path d="M1.48184 6.14503C1.48184 6.13051 1.48428 6.3339 1.48428 6.31937H0L2.1937 3.777L4.41646 6.31937H2.87975C2.87975 6.3339 2.87651 6.13051 2.87651 6.14503C2.87651 8.57118 4.7506 10.5324 7.06053 10.5324C8.10654 10.5324 9.06537 10.1257 9.79177 9.45738L10.7215 10.5615C9.73366 11.4622 8.4552 11.9998 7.06053 11.9998C3.98063 11.9998 1.48184 9.37022 1.48184 6.14503Z" fill="white"/>
+</svg>
diff --git a/Code/Tools/ProjectManager/Source/EngineScreenCtrl.cpp b/Code/Tools/ProjectManager/Source/EngineScreenCtrl.cpp
new file mode 100644
index 0000000000..c78a9426db
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/EngineScreenCtrl.cpp
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <EngineScreenCtrl.h>
+#include <GemRepo/GemRepoScreen.h>
+#include <EngineSettingsScreen.h>
+
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QTabWidget>
+
+namespace O3DE::ProjectManager
+{
+    EngineScreenCtrl::EngineScreenCtrl(QWidget* parent)
+        : ScreenWidget(parent)
+    {
+        QVBoxLayout* vLayout = new QVBoxLayout();
+        vLayout->setContentsMargins(0, 0, 0, 0);
+
+        QFrame* topBarFrameWidget = new QFrame(this);
+        topBarFrameWidget->setObjectName("engineTopFrame");
+        QHBoxLayout* topBarHLayout = new QHBoxLayout();
+        topBarHLayout->setContentsMargins(0, 0, 0, 0);
+        
+        topBarFrameWidget->setLayout(topBarHLayout);
+
+        QTabWidget* tabWidget = new QTabWidget();
+        tabWidget->setObjectName("engineTab");
+        tabWidget->tabBar()->setObjectName("engineTabBar");
+        tabWidget->tabBar()->setFocusPolicy(Qt::TabFocus);
+
+        m_engineSettingsScreen = new EngineSettingsScreen();
+        m_gemRepoScreen = new GemRepoScreen();
+
+        tabWidget->addTab(m_engineSettingsScreen, tr("General"));
+        tabWidget->addTab(m_gemRepoScreen, tr("Gem Repositories"));
+        topBarHLayout->addWidget(tabWidget);
+
+        vLayout->addWidget(topBarFrameWidget);
+
+        setLayout(vLayout);
+    }
+
+    ProjectManagerScreen EngineScreenCtrl::GetScreenEnum()
+    {
+        return ProjectManagerScreen::UpdateProject;
+    }
+
+    QString EngineScreenCtrl::GetTabText()
+    {
+        return tr("Engine");
+    }
+
+    bool EngineScreenCtrl::IsTab()
+    {
+        return true;
+    }
+
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/EngineScreenCtrl.h b/Code/Tools/ProjectManager/Source/EngineScreenCtrl.h
new file mode 100644
index 0000000000..9e799f13e7
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/EngineScreenCtrl.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <ScreenWidget.h>
+#endif
+
+namespace O3DE::ProjectManager
+{
+    QT_FORWARD_DECLARE_CLASS(EngineSettingsScreen)
+    QT_FORWARD_DECLARE_CLASS(GemRepoScreen)
+
+    class EngineScreenCtrl
+        : public ScreenWidget
+    {
+    public:
+        explicit EngineScreenCtrl(QWidget* parent = nullptr);
+        ~EngineScreenCtrl() = default;
+        ProjectManagerScreen GetScreenEnum() override;
+
+        QString GetTabText() override;
+        bool IsTab() override;
+
+        EngineSettingsScreen* m_engineSettingsScreen = nullptr;
+        GemRepoScreen* m_gemRepoScreen = nullptr;
+    };
+
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/EngineSettingsScreen.cpp b/Code/Tools/ProjectManager/Source/EngineSettingsScreen.cpp
index 0c24aac9f1..dec1c9a257 100644
--- a/Code/Tools/ProjectManager/Source/EngineSettingsScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/EngineSettingsScreen.cpp
@@ -7,15 +7,16 @@
  */
 
 #include <EngineSettingsScreen.h>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QMessageBox>
 #include <FormLineEditWidget.h>
 #include <FormFolderBrowseEditWidget.h>
 #include <PythonBindingsInterface.h>
 #include <PathValidator.h>
 
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMessageBox>
+
 namespace O3DE::ProjectManager
 {
     EngineSettingsScreen::EngineSettingsScreen(QWidget* parent)
@@ -78,16 +79,6 @@ namespace O3DE::ProjectManager
         return ProjectManagerScreen::EngineSettings;
     }
 
-    QString EngineSettingsScreen::GetTabText()
-    {
-        return tr("Engine");
-    }
-
-    bool EngineSettingsScreen::IsTab()
-    {
-        return true;
-    }
-
     void EngineSettingsScreen::OnTextChanged()
     {
         // save engine settings
diff --git a/Code/Tools/ProjectManager/Source/EngineSettingsScreen.h b/Code/Tools/ProjectManager/Source/EngineSettingsScreen.h
index 9d212c44b1..2f16400405 100644
--- a/Code/Tools/ProjectManager/Source/EngineSettingsScreen.h
+++ b/Code/Tools/ProjectManager/Source/EngineSettingsScreen.h
@@ -24,8 +24,6 @@ namespace O3DE::ProjectManager
         ~EngineSettingsScreen() = default;
 
         ProjectManagerScreen GetScreenEnum() override;
-        QString GetTabText() override;
-        bool IsTab() override;
 
     protected slots:
         void OnTextChanged();
diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInfo.cpp b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInfo.cpp
new file mode 100644
index 0000000000..3e524d8ec8
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInfo.cpp
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <GemRepo/GemRepoInfo.h>
+
+namespace O3DE::ProjectManager
+{
+    GemRepoInfo::GemRepoInfo(
+        const QString& name, const QString& creator, const QString& summary, const QDateTime& lastUpdated, bool isEnabled = true)
+        : m_name(name)
+        , m_creator(creator)
+        , m_summary(summary)
+        , m_lastUpdated(lastUpdated)
+        , m_isEnabled(isEnabled)
+    {
+    }
+    
+    bool GemRepoInfo::IsValid() const
+    {
+        return !m_name.isEmpty();
+    }
+
+    bool GemRepoInfo::operator<(const GemRepoInfo& gemRepoInfo) const
+    {
+        return (m_lastUpdated < gemRepoInfo.m_lastUpdated);
+    }
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInfo.h b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInfo.h
new file mode 100644
index 0000000000..6f4f828951
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInfo.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QString>
+#include <QDateTime>
+#endif
+
+namespace O3DE::ProjectManager
+{
+    class GemRepoInfo
+    {
+    public:
+        GemRepoInfo() = default;
+        GemRepoInfo(const QString& name, const QString& creator, const QString& summary, const QDateTime& lastUpdated, bool isEnabled);
+
+        bool IsValid() const;
+
+        bool operator<(const GemRepoInfo& gemRepoInfo) const;
+
+        QString m_path;
+        QString m_name = "Unknown Gem Repo Name";
+        QString m_creator = "Unknown Creator";
+        bool m_isEnabled = false; //! Is the repo currently enabled for this engine?
+        QString m_summary = "No summary provided.";
+        QString m_directoryLink;
+        QString m_repoLink;
+        QDateTime m_lastUpdated;
+    };
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoItemDelegate.cpp b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoItemDelegate.cpp
new file mode 100644
index 0000000000..88ccee2636
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoItemDelegate.cpp
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <GemRepo/GemRepoItemDelegate.h>
+#include <GemRepo/GemRepoModel.h>
+
+#include <QEvent>
+#include <QPainter>
+#include <QMouseEvent>
+
+namespace O3DE::ProjectManager
+{
+    GemRepoItemDelegate::GemRepoItemDelegate(QAbstractItemModel* model, QObject* parent)
+        : QStyledItemDelegate(parent)
+        , m_model(model)
+    {
+        m_refreshIcon   = QIcon(":/Refresh.svg").pixmap(s_refreshIconSize, s_refreshIconSize);
+        m_editIcon      = QIcon(":/Edit.svg").pixmap(s_iconSize, s_iconSize);
+        m_deleteIcon    = QIcon(":/Delete.svg").pixmap(s_iconSize, s_iconSize);
+    }
+
+    void GemRepoItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& modelIndex) const
+    {
+        if (!modelIndex.isValid())
+        {
+            return;
+        }
+
+        QStyleOptionViewItem options(option);
+        initStyleOption(&options, modelIndex);
+
+        painter->setRenderHint(QPainter::Antialiasing);
+
+        QRect fullRect, itemRect, contentRect;
+        CalcRects(options, fullRect, itemRect, contentRect);
+        QRect buttonRect = CalcButtonRect(contentRect);
+
+        QFont standardFont(options.font);
+        standardFont.setPixelSize(static_cast<int>(s_fontSize));
+        QFontMetrics standardFontMetrics(standardFont);
+
+        painter->save();
+        painter->setClipping(true);
+        painter->setClipRect(fullRect);
+        painter->setFont(standardFont);
+        painter->setPen(m_textColor);
+
+        // Draw background
+        painter->fillRect(fullRect, m_backgroundColor);
+
+        // Draw item background
+        const QColor itemBackgroundColor = options.state & QStyle::State_MouseOver ? m_itemBackgroundColor.lighter(120) : m_itemBackgroundColor;
+        painter->fillRect(itemRect, itemBackgroundColor);
+
+        // Draw border
+        if (options.state & QStyle::State_Selected)
+        {
+            painter->save();
+            QPen borderPen(m_borderColor);
+            borderPen.setWidth(s_borderWidth);
+            painter->setPen(borderPen);
+            painter->drawRect(itemRect);
+
+            painter->restore();
+        }
+
+        // Repo enabled
+        DrawButton(painter, buttonRect, modelIndex);
+
+        // Repo name
+        QString repoName = GemRepoModel::GetName(modelIndex);
+        repoName = QFontMetrics(standardFont).elidedText(repoName, Qt::TextElideMode::ElideRight, s_nameMaxWidth);
+
+        QRect repoNameRect = GetTextRect(standardFont, repoName, s_fontSize);
+        int currentHorizontalOffset = buttonRect.left() + s_buttonWidth + s_buttonSpacing;
+        repoNameRect.moveTo(currentHorizontalOffset, contentRect.center().y() - repoNameRect.height() / 2);
+        repoNameRect = painter->boundingRect(repoNameRect, Qt::TextSingleLine, repoName);
+
+        painter->drawText(repoNameRect, Qt::TextSingleLine, repoName);
+
+        // Rem repo creator
+        QString repoCreator = GemRepoModel::GetCreator(modelIndex);
+        repoCreator = standardFontMetrics.elidedText(repoCreator, Qt::TextElideMode::ElideRight, s_creatorMaxWidth);
+
+        QRect repoCreatorRect = GetTextRect(standardFont, repoCreator, s_fontSize);
+        currentHorizontalOffset += s_nameMaxWidth + s_contentSpacing;
+        repoCreatorRect.moveTo(currentHorizontalOffset, contentRect.center().y() - repoCreatorRect.height() / 2);
+        repoCreatorRect = painter->boundingRect(repoCreatorRect, Qt::TextSingleLine, repoCreator);
+
+        painter->drawText(repoCreatorRect, Qt::TextSingleLine, repoCreator);
+
+        // Repo update
+        QString repoUpdatedDate = GemRepoModel::GetLastUpdated(modelIndex).toString("dd/MM/yyyy hh:mmap");
+        repoUpdatedDate = standardFontMetrics.elidedText(repoUpdatedDate, Qt::TextElideMode::ElideRight, s_updatedMaxWidth);
+
+        QRect repoUpdatedDateRect = GetTextRect(standardFont, repoUpdatedDate, s_fontSize);
+        currentHorizontalOffset += s_creatorMaxWidth + s_contentSpacing;
+        repoUpdatedDateRect.moveTo(currentHorizontalOffset, contentRect.center().y() - repoUpdatedDateRect.height() / 2);
+        repoUpdatedDateRect = painter->boundingRect(repoUpdatedDateRect, Qt::TextSingleLine, repoUpdatedDate);
+
+        painter->drawText(repoUpdatedDateRect, Qt::TextSingleLine, repoUpdatedDate);
+
+        // Draw refresh button
+        painter->drawPixmap(
+            repoUpdatedDateRect.left() + repoUpdatedDateRect.width() + s_refreshIconSpacing,
+            contentRect.center().y() - s_refreshIconSize / 3, // Dividing size by 3 centers much better
+            m_refreshIcon);
+
+        if (options.state & QStyle::State_MouseOver)
+        {
+            DrawEditButtons(painter, contentRect);
+        }
+
+        painter->restore();
+    }
+
+    QSize GemRepoItemDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& modelIndex) const
+    {
+        QStyleOptionViewItem options(option);
+        initStyleOption(&options, modelIndex);
+
+        int marginsHorizontal = s_itemMargins.left() + s_itemMargins.right() + s_contentMargins.left() + s_contentMargins.right();
+        return QSize(marginsHorizontal + s_buttonWidth + s_buttonSpacing + s_nameMaxWidth + s_creatorMaxWidth + s_updatedMaxWidth + s_contentSpacing * 3, s_height);
+    }
+
+    bool GemRepoItemDelegate::editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& modelIndex)
+    {
+        if (!modelIndex.isValid())
+        {
+            return false;
+        }
+
+        if (event->type() == QEvent::KeyPress)
+        {
+            auto keyEvent = static_cast<const QKeyEvent*>(event);
+            if (keyEvent->key() == Qt::Key_Space)
+            {
+                const bool isAdded = GemRepoModel::IsEnabled(modelIndex);
+                GemRepoModel::SetEnabled(*model, modelIndex, !isAdded);
+                return true;
+            }
+        }
+
+        if (event->type() == QEvent::MouseButtonPress)
+        {
+            QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
+
+            QRect fullRect, itemRect, contentRect;
+            CalcRects(option, fullRect, itemRect, contentRect);
+            const QRect buttonRect = CalcButtonRect(contentRect);
+
+            if (buttonRect.contains(mouseEvent->pos()))
+            {
+                const bool isAdded = GemRepoModel::IsEnabled(modelIndex);
+                GemRepoModel::SetEnabled(*model, modelIndex, !isAdded);
+                return true;
+            }
+        }
+
+        return QStyledItemDelegate::editorEvent(event, model, option, modelIndex);
+    }
+
+    void GemRepoItemDelegate::CalcRects(const QStyleOptionViewItem& option, QRect& outFullRect, QRect& outItemRect, QRect& outContentRect) const
+    {
+        outFullRect = QRect(option.rect);
+        outItemRect = QRect(outFullRect.adjusted(s_itemMargins.left(), s_itemMargins.top(), -s_itemMargins.right(), -s_itemMargins.bottom()));
+        outContentRect = QRect(outItemRect.adjusted(s_contentMargins.left(), s_contentMargins.top(), -s_contentMargins.right(), -s_contentMargins.bottom()));
+    }
+
+    QRect GemRepoItemDelegate::GetTextRect(QFont& font, const QString& text, qreal fontSize) const
+    {
+        font.setPixelSize(static_cast<int>(fontSize));
+        return QFontMetrics(font).boundingRect(text);
+    }
+
+    QRect GemRepoItemDelegate::CalcButtonRect(const QRect& contentRect) const
+    {
+        const QPoint topLeft = QPoint(contentRect.left(), contentRect.top() + contentRect.height() / 2 - s_buttonHeight / 2);
+        const QSize size = QSize(s_buttonWidth, s_buttonHeight);
+        return QRect(topLeft, size);
+    }
+
+    void GemRepoItemDelegate::DrawButton(QPainter* painter, const QRect& buttonRect, const QModelIndex& modelIndex) const
+    {
+        painter->save();
+        QPoint circleCenter;
+
+        const bool isEnabled = GemRepoModel::IsEnabled(modelIndex);
+        if (isEnabled)
+        {
+            painter->setBrush(m_buttonEnabledColor);
+            painter->setPen(m_buttonEnabledColor);
+
+            circleCenter = buttonRect.center() + QPoint(buttonRect.width() / 2 - s_buttonBorderRadius + 1, 1);
+        }
+        else
+        {
+            circleCenter = buttonRect.center() + QPoint(-buttonRect.width() / 2 + s_buttonBorderRadius + 1, 1);
+        }
+
+        // Rounded rect
+        painter->drawRoundedRect(buttonRect, s_buttonBorderRadius, s_buttonBorderRadius);
+
+        // Circle
+        painter->setBrush(m_textColor);
+        painter->drawEllipse(circleCenter, s_buttonCircleRadius, s_buttonCircleRadius);
+
+        painter->restore();
+    }
+
+    void GemRepoItemDelegate::DrawEditButtons(QPainter* painter, const QRect& contentRect) const
+    {
+        painter->drawPixmap(contentRect.right() - s_iconSize * 2 - s_iconSpacing, contentRect.center().y() - s_iconSize / 2, m_editIcon);
+        painter->drawPixmap(contentRect.right() - s_iconSize, contentRect.center().y() - s_iconSize / 2, m_deleteIcon);
+    }
+
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoItemDelegate.h b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoItemDelegate.h
new file mode 100644
index 0000000000..08d1fdffae
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoItemDelegate.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QStyledItemDelegate>
+#include <GemRepo/GemRepoInfo.h>
+#endif
+
+QT_FORWARD_DECLARE_CLASS(QAbstractItemModel)
+QT_FORWARD_DECLARE_CLASS(QEvent)
+
+namespace O3DE::ProjectManager
+{
+    class GemRepoItemDelegate
+        : public QStyledItemDelegate
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        explicit GemRepoItemDelegate(QAbstractItemModel* model, QObject* parent = nullptr);
+        ~GemRepoItemDelegate() = default;
+
+        void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& modelIndex) const override;
+        bool editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& modelIndex) override;
+        QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& modelIndex) const override;
+
+        // Colors
+        const QColor m_textColor = QColor("#FFFFFF");
+        const QColor m_backgroundColor = QColor("#333333"); // Outside of the actual repo item
+        const QColor m_itemBackgroundColor = QColor("#404040"); // Background color of the repo item
+        const QColor m_borderColor = QColor("#1E70EB");
+        const QColor m_buttonEnabledColor = QColor("#1E70EB");
+
+        // Item
+        inline constexpr static int s_height = 72; // Repo item total height
+        inline constexpr static qreal s_fontSize = 12.0;
+
+        // Margin and borders
+        inline constexpr static QMargins s_itemMargins = QMargins(/*left=*/0, /*top=*/8, /*right=*/60, /*bottom=*/8); // Item border distances
+        inline constexpr static QMargins s_contentMargins = QMargins(/*left=*/20, /*top=*/20, /*right=*/20, /*bottom=*/20); // Distances of the elements within an item to the item borders
+        inline constexpr static int s_borderWidth = 4;
+
+        // Content
+        inline constexpr static int s_contentSpacing = 5;
+        inline constexpr static int s_nameMaxWidth = 145;
+        inline constexpr static int s_creatorMaxWidth = 115;
+        inline constexpr static int s_updatedMaxWidth = 125;
+
+        // Button
+        inline constexpr static int s_buttonWidth = 32;
+        inline constexpr static int s_buttonHeight = 16;
+        inline constexpr static int s_buttonBorderRadius = 8;
+        inline constexpr static int s_buttonCircleRadius = s_buttonBorderRadius - 2;
+        inline constexpr static int s_buttonSpacing = 20;
+
+        // Icon
+        inline constexpr static int s_iconSize = 24;
+        inline constexpr static int s_iconSpacing = 16;
+        inline constexpr static int s_refreshIconSize = 14;
+        inline constexpr static int s_refreshIconSpacing = 10;
+
+    protected:
+        void CalcRects(const QStyleOptionViewItem& option, QRect& outFullRect, QRect& outItemRect, QRect& outContentRect) const;
+        QRect GetTextRect(QFont& font, const QString& text, qreal fontSize) const;
+        QRect CalcButtonRect(const QRect& contentRect) const;
+        void DrawButton(QPainter* painter, const QRect& contentRect, const QModelIndex& modelIndex) const;
+        void DrawEditButtons(QPainter* painter, const QRect& contentRect) const;
+
+        QAbstractItemModel* m_model = nullptr;
+
+        QPixmap m_refreshIcon;
+        QPixmap m_editIcon;
+        QPixmap m_deleteIcon;
+    };
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoListView.cpp b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoListView.cpp
new file mode 100644
index 0000000000..519d52cb35
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoListView.cpp
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <GemRepo/GemRepoListView.h>
+#include <GemRepo/GemRepoItemDelegate.h>
+
+namespace O3DE::ProjectManager
+{
+    GemRepoListView::GemRepoListView(QAbstractItemModel* model, QWidget* parent)
+        : QListView(parent)
+    {
+        setObjectName("gemRepoListView");
+        setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
+
+        setModel(model);
+        setItemDelegate(new GemRepoItemDelegate(model, this));
+    }
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoListView.h b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoListView.h
new file mode 100644
index 0000000000..0fd5d5c180
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoListView.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QListView>
+#endif
+
+QT_FORWARD_DECLARE_CLASS(QAbstractItemModel)
+
+namespace O3DE::ProjectManager
+{
+    class GemRepoListView
+        : public QListView
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        explicit GemRepoListView(QAbstractItemModel* model, QWidget* parent = nullptr);
+        ~GemRepoListView() = default;
+    };
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.cpp b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.cpp
new file mode 100644
index 0000000000..7a42c135e9
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.cpp
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <GemRepo/GemRepoModel.h>
+
+#include <QItemSelectionModel>
+
+namespace O3DE::ProjectManager
+{
+    GemRepoModel::GemRepoModel(QObject* parent)
+        : QStandardItemModel(parent)
+    {
+        m_selectionModel = new QItemSelectionModel(this, parent);
+    }
+
+    QItemSelectionModel* GemRepoModel::GetSelectionModel() const
+    {
+        return m_selectionModel;
+    }
+
+    void GemRepoModel::AddGemRepo(const GemRepoInfo& gemRepoInfo)
+    {
+        QStandardItem* item = new QStandardItem();
+
+        item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
+
+        item->setData(gemRepoInfo.m_name, RoleName);
+        item->setData(gemRepoInfo.m_creator, RoleCreator);
+        item->setData(gemRepoInfo.m_summary, RoleSummary);
+        item->setData(gemRepoInfo.m_isEnabled, RoleIsEnabled);
+        item->setData(gemRepoInfo.m_directoryLink, RoleDirectoryLink);
+        item->setData(gemRepoInfo.m_repoLink, RoleRepoLink);
+        item->setData(gemRepoInfo.m_lastUpdated, RoleLastUpdated);
+        item->setData(gemRepoInfo.m_path, RolePath);
+
+        appendRow(item);
+    }
+
+    void GemRepoModel::Clear()
+    {
+        clear();
+    }
+
+    QString GemRepoModel::GetName(const QModelIndex& modelIndex)
+    {
+        return modelIndex.data(RoleName).toString();
+    }
+
+    QString GemRepoModel::GetCreator(const QModelIndex& modelIndex)
+    {
+        return modelIndex.data(RoleCreator).toString();
+    }
+
+    QString GemRepoModel::GetSummary(const QModelIndex& modelIndex)
+    {
+        return modelIndex.data(RoleSummary).toString();
+    }
+
+    QString GemRepoModel::GetDirectoryLink(const QModelIndex& modelIndex)
+    {
+        return modelIndex.data(RoleDirectoryLink).toString();
+    }
+
+    QString GemRepoModel::GetRepoLink(const QModelIndex& modelIndex)
+    {
+        return modelIndex.data(RoleRepoLink).toString();
+    }
+
+    QDateTime GemRepoModel::GetLastUpdated(const QModelIndex& modelIndex)
+    {
+        return modelIndex.data(RoleLastUpdated).toDateTime();
+    }
+
+    QString GemRepoModel::GetPath(const QModelIndex& modelIndex)
+    {
+        return modelIndex.data(RolePath).toString();
+    }
+
+    bool GemRepoModel::IsEnabled(const QModelIndex& modelIndex)
+    {
+        return modelIndex.data(RoleIsEnabled).toBool();
+    }
+
+    void GemRepoModel::SetEnabled(QAbstractItemModel& model, const QModelIndex& modelIndex, bool isEnabled)
+    {
+        model.setData(modelIndex, isEnabled, RoleIsEnabled);
+    }
+
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.h b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.h
new file mode 100644
index 0000000000..2f1537d339
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QStandardItemModel>
+#include <GemRepo/GemRepoInfo.h>
+#endif
+
+QT_FORWARD_DECLARE_CLASS(QItemSelectionModel)
+
+namespace O3DE::ProjectManager
+{
+    class GemRepoModel
+        : public QStandardItemModel
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        explicit GemRepoModel(QObject* parent = nullptr);
+        QItemSelectionModel* GetSelectionModel() const;
+
+        void AddGemRepo(const GemRepoInfo& gemInfo);
+        void Clear();
+
+        static QString GetName(const QModelIndex& modelIndex);
+        static QString GetCreator(const QModelIndex& modelIndex);
+        static QString GetSummary(const QModelIndex& modelIndex);
+        static QString GetDirectoryLink(const QModelIndex& modelIndex);
+        static QString GetRepoLink(const QModelIndex& modelIndex);
+        static QDateTime GetLastUpdated(const QModelIndex& modelIndex);
+        static QString GetPath(const QModelIndex& modelIndex);
+
+        static bool IsEnabled(const QModelIndex& modelIndex);
+        static void SetEnabled(QAbstractItemModel& model, const QModelIndex& modelIndex, bool isEnabled);
+
+    private:
+        enum UserRole
+        {
+            RoleName = Qt::UserRole,
+            RoleCreator,
+            RoleSummary,
+            RoleIsEnabled,
+            RoleDirectoryLink,
+            RoleRepoLink,
+            RoleLastUpdated,
+            RolePath
+        };
+
+        QItemSelectionModel* m_selectionModel = nullptr;
+    };
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp
new file mode 100644
index 0000000000..82de53a0d0
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <GemRepo/GemRepoScreen.h>
+#include <GemRepo/GemRepoItemDelegate.h>
+#include <GemRepo/GemRepoListView.h>
+#include <GemRepo/GemRepoModel.h>
+#include <PythonBindingsInterface.h>
+
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QTimer>
+#include <QMessageBox>
+#include <QLabel>
+#include <QHeaderView>
+#include <QTableWidget>
+
+namespace O3DE::ProjectManager
+{
+    GemRepoScreen::GemRepoScreen(QWidget* parent)
+        : ScreenWidget(parent)
+    {
+        m_gemRepoModel = new GemRepoModel(this);
+
+        QVBoxLayout* vLayout = new QVBoxLayout();
+        vLayout->setMargin(0);
+        vLayout->setSpacing(0);
+        setLayout(vLayout);
+
+        QHBoxLayout* hLayout = new QHBoxLayout();
+        hLayout->setMargin(0);
+        hLayout->setSpacing(0);
+        vLayout->addLayout(hLayout);
+
+        hLayout->addSpacing(60);
+
+        m_gemRepoInspector = new QFrame(this);
+        m_gemRepoInspector->setObjectName(tr("gemRepoInspector"));
+        m_gemRepoInspector->setFixedWidth(240);
+
+        QVBoxLayout* middleVLayout = new QVBoxLayout();
+        middleVLayout->setMargin(0);
+        middleVLayout->setSpacing(0);
+
+        middleVLayout->addSpacing(30);
+
+        QHBoxLayout* topMiddleHLayout = new QHBoxLayout();
+        topMiddleHLayout->setMargin(0);
+        topMiddleHLayout->setSpacing(0);
+
+        m_lastAllUpdateLabel = new QLabel(tr("Last Updated: Never"), this);
+        m_lastAllUpdateLabel->setObjectName("gemRepoHeaderLabel");
+        topMiddleHLayout->addWidget(m_lastAllUpdateLabel);
+
+        topMiddleHLayout->addSpacing(20);
+
+        m_AllUpdateButton = new QPushButton(QIcon(":/Refresh.svg"), tr("Update All"), this);
+        m_AllUpdateButton->setObjectName("gemRepoHeaderRefreshButton");
+        topMiddleHLayout->addWidget(m_AllUpdateButton);
+
+        topMiddleHLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum));
+
+        m_AddRepoButton = new QPushButton(tr("Add Repository"), this);
+        m_AddRepoButton->setObjectName("gemRepoHeaderAddButton");
+        topMiddleHLayout->addWidget(m_AddRepoButton);
+
+        middleVLayout->addLayout(topMiddleHLayout);
+
+        middleVLayout->addSpacing(30);
+
+        // Create a QTableWidget just for its header
+        // Using a seperate model allows the setup  of a header exactly as needed
+        m_gemRepoHeaderTable = new QTableWidget(this);
+        m_gemRepoHeaderTable->setObjectName("gemRepoHeaderTable");
+        m_gemRepoListHeader = m_gemRepoHeaderTable->horizontalHeader();
+        m_gemRepoListHeader->setObjectName("gemRepoListHeader");
+        m_gemRepoListHeader->setSectionResizeMode(QHeaderView::ResizeMode::Fixed);
+
+        // Insert columns so the header labels will show up
+        m_gemRepoHeaderTable->insertColumn(0);
+        m_gemRepoHeaderTable->insertColumn(1);
+        m_gemRepoHeaderTable->insertColumn(2);
+        m_gemRepoHeaderTable->insertColumn(3);
+        m_gemRepoHeaderTable->setHorizontalHeaderLabels({ tr("Enabled"), tr("Repository Name"), tr("Creator"), tr("Updated") });
+
+        const int headerExtraMargin = 10;
+        m_gemRepoListHeader->resizeSection(0, GemRepoItemDelegate::s_buttonWidth + GemRepoItemDelegate::s_buttonSpacing - 3);
+        m_gemRepoListHeader->resizeSection(1, GemRepoItemDelegate::s_nameMaxWidth + GemRepoItemDelegate::s_contentSpacing - headerExtraMargin);
+        m_gemRepoListHeader->resizeSection(2, GemRepoItemDelegate::s_creatorMaxWidth + GemRepoItemDelegate::s_contentSpacing - headerExtraMargin);
+        m_gemRepoListHeader->resizeSection(3, GemRepoItemDelegate::s_updatedMaxWidth + GemRepoItemDelegate::s_contentSpacing - headerExtraMargin);
+
+        // Required to set stylesheet in code as it will not be respected if set in qss
+        m_gemRepoHeaderTable->horizontalHeader()->setStyleSheet("QHeaderView::section { background-color:transparent; color:white; font-size:12px; text-align:left; border-style:none; }");
+        middleVLayout->addWidget(m_gemRepoHeaderTable);
+
+        m_gemRepoListView = new GemRepoListView(m_gemRepoModel, this);
+        middleVLayout->addWidget(m_gemRepoListView);
+
+        hLayout->addLayout(middleVLayout);
+        hLayout->addWidget(m_gemRepoInspector);
+
+        Reinit();
+    }
+
+    void GemRepoScreen::Reinit()
+    {
+        m_gemRepoModel->clear();
+        FillModel();
+
+        // Select the first entry after everything got correctly sized
+        QTimer::singleShot(200, [=]{
+            QModelIndex firstModelIndex = m_gemRepoListView->model()->index(0,0);
+            m_gemRepoListView->selectionModel()->select(firstModelIndex, QItemSelectionModel::ClearAndSelect);
+            });
+    }
+
+    void GemRepoScreen::FillModel()
+    {
+        AZ::Outcome<QVector<GemRepoInfo>, AZStd::string> allGemRepoInfosResult = PythonBindingsInterface::Get()->GetAllGemRepoInfos();
+        if (allGemRepoInfosResult.IsSuccess())
+        {
+            // Add all available repos to the model
+            const QVector<GemRepoInfo> allGemRepoInfos = allGemRepoInfosResult.GetValue();
+            for (const GemRepoInfo& gemRepoInfo : allGemRepoInfos)
+            {
+                m_gemRepoModel->AddGemRepo(gemRepoInfo);
+            }
+        }
+        else
+        {
+            QMessageBox::critical(this, tr("Operation failed"), QString("Cannot retrieve gem repos for engine.\n\nError:\n%2").arg(allGemRepoInfosResult.GetError().c_str()));
+        }
+    }
+
+    ProjectManagerScreen GemRepoScreen::GetScreenEnum()
+    {
+        return ProjectManagerScreen::GemRepos;
+    }
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.h b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.h
new file mode 100644
index 0000000000..b5316db84f
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <ScreenWidget.h>
+#endif
+
+QT_FORWARD_DECLARE_CLASS(QLabel)
+QT_FORWARD_DECLARE_CLASS(QPushButton)
+QT_FORWARD_DECLARE_CLASS(QHeaderView)
+QT_FORWARD_DECLARE_CLASS(QTableWidget)
+
+namespace O3DE::ProjectManager
+{
+    QT_FORWARD_DECLARE_CLASS(GemRepoListView)
+    QT_FORWARD_DECLARE_CLASS(GemRepoModel)
+
+    class GemRepoScreen
+        : public ScreenWidget
+    {
+    public:
+        explicit GemRepoScreen(QWidget* parent = nullptr);
+        ~GemRepoScreen() = default;
+        ProjectManagerScreen GetScreenEnum() override;
+
+        void Reinit();
+
+        GemRepoModel* GetGemRepoModel() const { return m_gemRepoModel; }
+
+    private:
+        void FillModel();
+
+        QTableWidget* m_gemRepoHeaderTable = nullptr;
+        QHeaderView* m_gemRepoListHeader = nullptr;
+        GemRepoListView* m_gemRepoListView = nullptr;
+        QFrame* m_gemRepoInspector = nullptr;
+        GemRepoModel* m_gemRepoModel = nullptr;
+
+        QLabel* m_lastAllUpdateLabel;
+        QPushButton* m_AllUpdateButton;
+        QPushButton* m_AddRepoButton;
+    };
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ProjectManagerWindow.cpp b/Code/Tools/ProjectManager/Source/ProjectManagerWindow.cpp
index a723ccb917..d2f2d969f1 100644
--- a/Code/Tools/ProjectManager/Source/ProjectManagerWindow.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectManagerWindow.cpp
@@ -22,7 +22,7 @@ namespace O3DE::ProjectManager
         QVector<ProjectManagerScreen> screenEnums =
         {
             ProjectManagerScreen::Projects,
-            ProjectManagerScreen::EngineSettings,
+            ProjectManagerScreen::Engine,
             ProjectManagerScreen::CreateProject,
             ProjectManagerScreen::UpdateProject
         };
diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.cpp b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
index 18901946f3..6f8ff9abce 100644
--- a/Code/Tools/ProjectManager/Source/PythonBindings.cpp
+++ b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
@@ -912,4 +912,45 @@ namespace O3DE::ProjectManager
             return AZ::Success(AZStd::move(templates));
         }
     }
+
+    GemRepoInfo PythonBindings::GemRepoInfoFromPath(pybind11::handle path, pybind11::handle pyEnginePath)
+    {
+        /* Placeholder Logic */
+        (void)path;
+        (void)pyEnginePath;
+
+        return GemRepoInfo();
+    }
+
+//#define MOCK_GEM_REPO_INFO true
+
+    AZ::Outcome<QVector<GemRepoInfo>, AZStd::string> PythonBindings::GetAllGemRepoInfos()
+    {
+        QVector<GemRepoInfo> gemRepos;
+
+#ifndef MOCK_GEM_REPO_INFO
+        auto result = ExecuteWithLockErrorHandling(
+            [&]
+            {
+                /* Placeholder Logic, o3de scripts need method added
+                * 
+                for (auto path : m_manifest.attr("get_gem_repos")())
+                {
+                    gemRepos.push_back(GemRepoInfoFromPath(path, pybind11::none()));
+                }
+                *
+                */
+            });
+        if (!result.IsSuccess())
+        {
+            return AZ::Failure<AZStd::string>(result.GetError().c_str());
+        }
+#else
+        gemRepos.push_back(GemRepoInfo("JohnCreates", "John Smith", "", QDateTime(QDate(2021, 8, 31), QTime(11, 57)), true));
+        gemRepos.push_back(GemRepoInfo("JanesGems", "Jane Doe", "", QDateTime(QDate(2021, 9, 10), QTime(18, 23)), false));
+#endif // MOCK_GEM_REPO_INFO
+
+        std::sort(gemRepos.begin(), gemRepos.end());
+        return AZ::Success(AZStd::move(gemRepos));
+    }
 }
diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.h b/Code/Tools/ProjectManager/Source/PythonBindings.h
index 8482ac56e7..3b766c3797 100644
--- a/Code/Tools/ProjectManager/Source/PythonBindings.h
+++ b/Code/Tools/ProjectManager/Source/PythonBindings.h
@@ -56,12 +56,16 @@ namespace O3DE::ProjectManager
         // ProjectTemplate
         AZ::Outcome<QVector<ProjectTemplateInfo>> GetProjectTemplates(const QString& projectPath = {}) override;
 
+        // Gem Repos
+        AZ::Outcome<QVector<GemRepoInfo>, AZStd::string> GetAllGemRepoInfos() override;
+
     private:
         AZ_DISABLE_COPY_MOVE(PythonBindings);
 
         AZ::Outcome<void, AZStd::string> ExecuteWithLockErrorHandling(AZStd::function<void()> executionCallback);
         bool ExecuteWithLock(AZStd::function<void()> executionCallback);
         GemInfo GemInfoFromPath(pybind11::handle path, pybind11::handle pyProjectPath);
+        GemRepoInfo GemRepoInfoFromPath(pybind11::handle path, pybind11::handle pyEnginePath);
         ProjectInfo ProjectInfoFromPath(pybind11::handle path);
         ProjectTemplateInfo ProjectTemplateInfoFromPath(pybind11::handle path, pybind11::handle pyProjectPath);
         bool RegisterThisEngine();
diff --git a/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h b/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h
index ca14a54630..9fd3002f93 100644
--- a/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h
+++ b/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h
@@ -17,6 +17,7 @@
 #include <GemCatalog/GemInfo.h>
 #include <ProjectInfo.h>
 #include <ProjectTemplateInfo.h>
+#include <GemRepo/GemRepoInfo.h>
 
 namespace O3DE::ProjectManager
 {
@@ -56,14 +57,14 @@ namespace O3DE::ProjectManager
 
         /**
          * Get info about a Gem 
-         * @param path the absolute path to the Gem 
+         * @param projectPath the absolute path to the Gem 
          * @return an outcome with GemInfo on success 
          */
         virtual AZ::Outcome<GemInfo> GetGemInfo(const QString& path, const QString& projectPath = {}) = 0;
 
         /**
          * Get all available gem infos. This concatenates gems registered by the engine and the project.
-         * @param path The absolute path to the project.
+         * @param projectPath The absolute path to the project.
          * @return A list of gem infos.
          */
         virtual AZ::Outcome<QVector<GemInfo>, AZStd::string> GetAllGemInfos(const QString& projectPath) = 0;
@@ -155,6 +156,14 @@ namespace O3DE::ProjectManager
          * @return an outcome with ProjectTemplateInfos on success 
          */
         virtual AZ::Outcome<QVector<ProjectTemplateInfo>> GetProjectTemplates(const QString& projectPath = {}) = 0;
+
+        // Gem Repos
+
+        /**
+         * Get all available gem repo infos. Gathers all repos registered with the engine.
+         * @return A list of gem repo infos.
+         */
+        virtual AZ::Outcome<QVector<GemRepoInfo>, AZStd::string> GetAllGemRepoInfos() = 0;
     };
 
     using PythonBindingsInterface = AZ::Interface<IPythonBindings>;
diff --git a/Code/Tools/ProjectManager/Source/ScreenDefs.h b/Code/Tools/ProjectManager/Source/ScreenDefs.h
index 97ebe19751..2ced8c08c9 100644
--- a/Code/Tools/ProjectManager/Source/ScreenDefs.h
+++ b/Code/Tools/ProjectManager/Source/ScreenDefs.h
@@ -23,7 +23,9 @@ namespace O3DE::ProjectManager
         Projects,
         UpdateProject,
         UpdateProjectSettings,
-        EngineSettings
+        Engine,
+        EngineSettings,
+        GemRepos
     };
 
     static QHash<QString, ProjectManagerScreen> s_ProjectManagerStringNames = {
@@ -34,7 +36,9 @@ namespace O3DE::ProjectManager
         { "Projects", ProjectManagerScreen::Projects},
         { "UpdateProject", ProjectManagerScreen::UpdateProject},
         { "UpdateProjectSettings", ProjectManagerScreen::UpdateProjectSettings},
-        { "EngineSettings", ProjectManagerScreen::EngineSettings}
+        { "Engine", ProjectManagerScreen::Engine},
+        { "EngineSettings", ProjectManagerScreen::EngineSettings},
+        { "GemRepos", ProjectManagerScreen::GemRepos}
     };
 
     // need to define qHash for ProjectManagerScreen when using scoped enums
diff --git a/Code/Tools/ProjectManager/Source/ScreenFactory.cpp b/Code/Tools/ProjectManager/Source/ScreenFactory.cpp
index f3bddfdd27..44aa713e6a 100644
--- a/Code/Tools/ProjectManager/Source/ScreenFactory.cpp
+++ b/Code/Tools/ProjectManager/Source/ScreenFactory.cpp
@@ -13,7 +13,9 @@
 #include <GemCatalog/GemCatalogScreen.h>
 #include <ProjectsScreen.h>
 #include <UpdateProjectSettingsScreen.h>
+#include <EngineScreenCtrl.h>
 #include <EngineSettingsScreen.h>
+#include <GemRepo/GemRepoScreen.h>
 
 namespace O3DE::ProjectManager
 {
@@ -41,9 +43,15 @@ namespace O3DE::ProjectManager
         case (ProjectManagerScreen::UpdateProjectSettings):
             newScreen = new UpdateProjectSettingsScreen(parent);
             break;
+        case (ProjectManagerScreen::Engine):
+            newScreen = new EngineScreenCtrl(parent);
+            break;
         case (ProjectManagerScreen::EngineSettings):
             newScreen = new EngineSettingsScreen(parent);
             break;
+        case (ProjectManagerScreen::GemRepos):
+            newScreen = new GemRepoScreen(parent);
+            break;
         case (ProjectManagerScreen::Empty):
         default:
             newScreen = new ScreenWidget(parent);
diff --git a/Code/Tools/ProjectManager/project_manager_files.cmake b/Code/Tools/ProjectManager/project_manager_files.cmake
index 6d0f392e52..7a336972e0 100644
--- a/Code/Tools/ProjectManager/project_manager_files.cmake
+++ b/Code/Tools/ProjectManager/project_manager_files.cmake
@@ -56,6 +56,8 @@ set(FILES
     Source/ProjectsScreen.cpp
     Source/ProjectSettingsScreen.h
     Source/ProjectSettingsScreen.cpp
+    Source/EngineScreenCtrl.h
+    Source/EngineScreenCtrl.cpp
     Source/EngineSettingsScreen.h
     Source/EngineSettingsScreen.cpp
     Source/ProjectButtonWidget.h
@@ -98,4 +100,14 @@ set(FILES
     Source/GemCatalog/GemRequirementListView.cpp
     Source/GemCatalog/GemSortFilterProxyModel.h
     Source/GemCatalog/GemSortFilterProxyModel.cpp
+    Source/GemRepo/GemRepoScreen.h
+    Source/GemRepo/GemRepoScreen.cpp
+    Source/GemRepo/GemRepoInfo.h
+    Source/GemRepo/GemRepoInfo.cpp
+    Source/GemRepo/GemRepoItemDelegate.h
+    Source/GemRepo/GemRepoItemDelegate.cpp
+    Source/GemRepo/GemRepoListView.h
+    Source/GemRepo/GemRepoListView.cpp
+    Source/GemRepo/GemRepoModel.h
+    Source/GemRepo/GemRepoModel.cpp
 )
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialAsset.h
index 52af56ba0e..6ca3bca652 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialAsset.h
@@ -19,6 +19,11 @@
 
 #include <AzCore/EBus/Event.h>
 
+namespace UnitTest
+{
+    class MaterialTests;
+}
+
 namespace AZ
 {
     class ReflectContext;
@@ -40,6 +45,7 @@ namespace AZ
             friend class MaterialAssetCreator;
             friend class MaterialAssetHandler;
             friend class MaterialAssetCreatorCommon;
+            friend class UnitTest::MaterialTests;
 
         public:
             AZ_RTTI(MaterialAsset, "{522C7BE0-501D-463E-92C6-15184A2B7AD8}", AZ::Data::AssetData);
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Material/Material.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Material/Material.cpp
index 2dcaa70deb..d44ed40c7b 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Material/Material.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Material/Material.cpp
@@ -100,9 +100,15 @@ namespace AZ
                 ShaderReloadNotificationBus::MultiHandler::BusConnect(shaderItem.GetShaderAsset().GetId());
             }
 
+            // If this Init() is actually a re-initialize, we need to re-apply any overridden property values
+            // after loading the property values from the asset, so we save that data here.
             MaterialPropertyFlags prevOverrideFlags = m_propertyOverrideFlags;
             AZStd::vector<MaterialPropertyValue> prevPropertyValues = m_propertyValues;
 
+            // The property values are cleared to their default state to ensure that SetPropertyValue() does not early-return
+            // when called below. This is important when Init() is actually a re-initialize.
+            m_propertyValues.clear();
+
             // Initialize the shader runtime data like shader constant buffers and shader variants by applying the 
             // material's property values. This will feed through the normal runtime material value-change data flow, which may
             // include custom property change handlers provided by the material type.
@@ -504,7 +510,7 @@ namespace AZ
 
             MaterialPropertyValue& savedPropertyValue = m_propertyValues[index.GetIndex()];
 
-            // If the property value didn't actually change, don't waste time running functors and compiling the changes
+            // If the property value didn't actually change, don't waste time running functors and compiling the changes.
             if (savedPropertyValue == value)
             {
                 return false;
diff --git a/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp
index d82a17e1f3..f202747bf6 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp
@@ -182,6 +182,13 @@ namespace UnitTest
             EXPECT_EQ(srgData.GetImageView(srgData.FindShaderInputImageIndex(Name{ "m_image" }), 0), m_testImage->GetImageView());
             EXPECT_EQ(srgData.GetConstant<uint32_t>(srgData.FindShaderInputConstantIndex(Name{ "m_enum" })), 2u);
         }
+
+        //! Provides write access to private material asset property values, primarily for simulating
+        //! MaterialAsset hot reload.
+        MaterialPropertyValue& AccessMaterialAssetPropertyValue(Data::Asset<MaterialAsset> materialAsset, Name propertyName)
+        {
+            return materialAsset->m_propertyValues[materialAsset->GetMaterialPropertiesLayout()->FindPropertyIndex(propertyName).GetIndex()];
+        }
     };
 
     TEST_F(MaterialTests, TestCreateVsFindOrCreate)
@@ -313,6 +320,30 @@ namespace UnitTest
         EXPECT_EQ(srgData.GetConstant<uint32_t>(srgData.FindShaderInputConstantIndex(Name{ "m_uint" })), 42u);
     }
 
+    TEST_F(MaterialTests, TestSetPropertyValueWhenValueIsUnchanged)
+    {
+        Data::Instance<Material> material = Material::FindOrCreate(m_testMaterialAsset);
+        
+        EXPECT_TRUE(material->SetPropertyValue<float>(material->FindPropertyIndex(Name{ "MyFloat" }), 2.5f));
+
+        ProcessQueuedSrgCompilations(m_testMaterialShaderAsset, m_testMaterialSrgLayout->GetName());
+        EXPECT_TRUE(material->Compile());
+
+        // Taint the SRG so we can check whether it was set by the SetPropertyValue() calls below.
+        const RHI::ShaderResourceGroup* srg = material->GetRHIShaderResourceGroup();
+        const RHI::ShaderResourceGroupData& srgData = srg->GetData();
+        const_cast<RHI::ShaderResourceGroupData*>(&srgData)->SetConstant(m_testMaterialSrgLayout->FindShaderInputConstantIndex(Name{"m_float"}), 0.0f);
+
+        // Set the properties to the same values as before
+        EXPECT_FALSE(material->SetPropertyValue<float>(material->FindPropertyIndex(Name{ "MyFloat" }), 2.5f));
+        
+        ProcessQueuedSrgCompilations(m_testMaterialShaderAsset, m_testMaterialSrgLayout->GetName());
+        EXPECT_FALSE(material->Compile());
+
+        // Make sure the SRG is still tainted, because the SetPropertyValue() functions weren't processed
+        EXPECT_EQ(srgData.GetConstant<float>(srgData.FindShaderInputConstantIndex(Name{ "m_float" })), 0.0f);
+    }
+
     TEST_F(MaterialTests, TestImageNotProvided)
     {
         Data::Asset<MaterialAsset> materialAssetWithEmptyImage;
@@ -785,4 +816,45 @@ namespace UnitTest
             EXPECT_EQ((float)inputColor.GetElement(i), (float)colorFromMaterial.GetElement(i));
         }
     }
+
+    TEST_F(MaterialTests, TestReinitializeForHotReload)
+    {
+        Data::Instance<Material> material = Material::FindOrCreate(m_testMaterialAsset);
+        const RHI::ShaderResourceGroupData* srgData = &material->GetRHIShaderResourceGroup()->GetData();
+        ProcessQueuedSrgCompilations(m_testMaterialShaderAsset, m_testMaterialSrgLayout->GetName());
+
+        // Check the default property value
+        EXPECT_EQ(material->GetPropertyValue<float>(material->FindPropertyIndex(Name{ "MyFloat" })), 1.5f);
+        EXPECT_EQ(srgData->GetConstant<float>(srgData->FindShaderInputConstantIndex(Name{ "m_float" })), 1.5f);
+        EXPECT_EQ(material->GetPropertyValue<int32_t>(material->FindPropertyIndex(Name{ "MyInt" })), -2);
+        EXPECT_EQ(srgData->GetConstant<int32_t>(srgData->FindShaderInputConstantIndex(Name{ "m_int" })), -2);
+
+        // Override a property value
+        EXPECT_TRUE(material->SetPropertyValue<float>(material->FindPropertyIndex(Name{ "MyFloat" }), 5.5f));
+
+        // Apply the changes
+        EXPECT_TRUE(material->Compile());
+        ProcessQueuedSrgCompilations(m_testMaterialShaderAsset, m_testMaterialSrgLayout->GetName());
+
+        // Check the updated values with one overridden
+        EXPECT_EQ(material->GetPropertyValue<float>(material->FindPropertyIndex(Name{ "MyFloat" })), 5.5f);
+        EXPECT_EQ(srgData->GetConstant<float>(srgData->FindShaderInputConstantIndex(Name{ "m_float" })), 5.5f);
+        EXPECT_EQ(material->GetPropertyValue<int32_t>(material->FindPropertyIndex(Name{ "MyInt" })), -2);
+        EXPECT_EQ(srgData->GetConstant<int32_t>(srgData->FindShaderInputConstantIndex(Name{ "m_int" })), -2);
+
+        // Pretend there was a hot-reload with new default values
+        AccessMaterialAssetPropertyValue(m_testMaterialAsset, Name{"MyFloat"}) = 0.5f;
+        AccessMaterialAssetPropertyValue(m_testMaterialAsset, Name{"MyInt"}) = -7;
+        AZ::Data::AssetBus::Event(m_testMaterialAsset.GetId(), &AZ::Data::AssetBus::Handler::OnAssetReloaded, m_testMaterialAsset);
+        srgData = &material->GetRHIShaderResourceGroup()->GetData();
+        ProcessQueuedSrgCompilations(m_testMaterialShaderAsset, m_testMaterialSrgLayout->GetName());
+
+        // Make sure the override values are still there
+        EXPECT_EQ(srgData->GetConstant<float>(srgData->FindShaderInputConstantIndex(Name{ "m_float" })), 5.5f);
+        EXPECT_EQ(material->GetPropertyValue<float>(material->FindPropertyIndex(Name{ "MyFloat" })), 5.5f);
+
+        // Make sure the new default value is applied where it was not overridden
+        EXPECT_EQ(material->GetPropertyValue<int32_t>(material->FindPropertyIndex(Name{ "MyInt" })), -7);
+        EXPECT_EQ(srgData->GetConstant<int32_t>(srgData->FindShaderInputConstantIndex(Name{ "m_int" })), -7);
+    }
 }
diff --git a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCommands.cpp
index dbc25d7a60..bd5a14f772 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCommands.cpp
@@ -715,12 +715,15 @@ namespace CommandSystem
         // restore the workspace dirty flag
         GetCommandManager()->SetWorkspaceDirtyFlag(m_oldWorkspaceDirtyFlag);
 
-        AZStd::string resultString;
-        GetCommandManager()->ExecuteCommandInsideCommand("Unselect -animGraphIndex SELECT_ALL", resultString);
+        MCore::CommandGroup commandGroup;
+        commandGroup.AddCommandString("RecorderClear");
+        commandGroup.AddCommandString("Unselect -animGraphIndex SELECT_ALL");
         if (animGraph)
         {
-            GetCommandManager()->ExecuteCommandInsideCommand(AZStd::string::format("Select -animGraphID %d", animGraph->GetID()), resultString);
+            commandGroup.AddCommandString(AZStd::string::format("Select -animGraphID %d", animGraph->GetID()));
         }
+        AZStd::string resultString;
+        GetCommandManager()->ExecuteCommandGroupInsideCommand(commandGroup, resultString);
 
         return true;
     }
diff --git a/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt b/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt
index 21c4755a2e..2cbbe58b38 100644
--- a/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt
+++ b/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt
@@ -13,6 +13,8 @@ libxcb-xinput0                          # For Qt plugins at runtime
 libfontconfig1-dev                      # For Qt plugins at runtime
 libcurl4-openssl-dev                    # For HttpRequestor
 libsdl2-dev                             # for WWise/Audio
-libxkbcommon-dev
+libxcb-xkb-dev                          # For xcb keyboard input
+libxkbcommon-x11-dev                    # For xcb keyboard input
+libxkbcommon-dev                        # For xcb keyboard input
 zlib1g-dev
 mesa-common-dev