From 4edbf7890bfc15890a9b5b6b0f5c205c09568df6 Mon Sep 17 00:00:00 2001
From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
Date: Thu, 15 Apr 2021 19:01:15 -0700
Subject: [PATCH] Bringing fix that has not been migrated to github yet (fixes
 Windows release builds)

---
 AutomatedTesting/Gem/PythonTests/CMakeLists.txt             | 1 +
 Gems/AtomLyIntegration/ImguiAtom/Code/Source/DebugConsole.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/AutomatedTesting/Gem/PythonTests/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/CMakeLists.txt
index ea9c365978..b7a5f85087 100644
--- a/AutomatedTesting/Gem/PythonTests/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/CMakeLists.txt
@@ -138,6 +138,7 @@ endif()
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
     ly_add_pytest(
         NAME AutomatedTesting::BlastTests
+        TEST_SUITE sandbox
         TEST_SERIAL TRUE
         PATH ${CMAKE_CURRENT_LIST_DIR}/Blast/TestSuite_Active.py
         TIMEOUT 3600
diff --git a/Gems/AtomLyIntegration/ImguiAtom/Code/Source/DebugConsole.h b/Gems/AtomLyIntegration/ImguiAtom/Code/Source/DebugConsole.h
index 29b2bfc4b5..44fa5b09e1 100644
--- a/Gems/AtomLyIntegration/ImguiAtom/Code/Source/DebugConsole.h
+++ b/Gems/AtomLyIntegration/ImguiAtom/Code/Source/DebugConsole.h
@@ -34,7 +34,6 @@ namespace AZ
 #if !defined(IMGUI_ENABLED)
     class DebugConsole {};
 #else
-#endif // defined(IMGUI_ENABLED)
     ////////////////////////////////////////////////////////////////////////////////////////////////
     //! A debug console used to enter debug console commands and display debug log messages.
     //!
@@ -132,4 +131,5 @@ namespace AZ
         bool m_autoScroll = true; //!< Should we auto-scroll as new entries are added?
         bool m_forceScroll = false; //!< Do we need to force scroll after input entered?
     };
+#endif // defined(IMGUI_ENABLED)
 } // namespace AZ