diff --git a/.nuget/directxtk_desktop_win10.nuspec b/.nuget/directxtk_desktop_win10.nuspec
index ae0d6d66..dbc8ab99 100644
--- a/.nuget/directxtk_desktop_win10.nuspec
+++ b/.nuget/directxtk_desktop_win10.nuspec
@@ -30,7 +30,7 @@ SpriteBatch - simple & efficient 2D sprite rendering
 SpriteFont - bitmap based text rendering
 VertexTypes - structures for commonly used vertex data formats
 WICTextureLoader - WIC-based image file texture loader</description>
-        <releaseNotes>Matches the March 31, 2026 release on GitHub.
+        <releaseNotes>Matches the May 7, 2026 release on GitHub.
 
 DirectX Tool Kit for Audio in this package uses XAudio 2.9 which requires Windows 10 or later.</releaseNotes>
         <projectUrl>http://go.microsoft.com/fwlink/?LinkId=248929</projectUrl>
diff --git a/.nuget/directxtk_uwp.nuspec b/.nuget/directxtk_uwp.nuspec
index 788948a2..d97b43e3 100644
--- a/.nuget/directxtk_uwp.nuspec
+++ b/.nuget/directxtk_uwp.nuspec
@@ -30,7 +30,7 @@ SpriteBatch - simple &amp; efficient 2D sprite rendering
 SpriteFont - bitmap based text rendering
 VertexTypes - structures for commonly used vertex data formats
 WICTextureLoader - WIC-based image file texture loader</description>
-        <releaseNotes>Matches the March 31, 2026 release on GitHub.</releaseNotes>
+        <releaseNotes>Matches the May 7, 2026 release on GitHub.</releaseNotes>
         <projectUrl>http://go.microsoft.com/fwlink/?LinkId=248929</projectUrl>
         <repository type="git" url="https://github.com/microsoft/DirectXTK.git" />
         <icon>images\icon.jpg</icon>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b6bb911..f20c6649 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT
 
 ## Release History
 
+### May 7, 2026
+* SpriteFont file loader updated to fix a potential overflow issue in 32-bit (x86) builds
+* XWB reader updated to resolve a potential overflow issue when reading a malformed wavebank file
+* CMake project updates
+* Minor comments cleanup
+
 ### March 31, 2026
 * Added SpriteFont **SetPixelAlignment** method for opt-in pixel snapping support
 * VS 2026 support
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a85cb78..d97b3ebe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ if(POLICY CMP0162)
    cmake_policy(SET CMP0162 NEW)
 endif()
 
-set(DIRECTXTK_VERSION 1.9.3)
+set(DIRECTXTK_VERSION 1.9.4)
 
 if(XBOX_CONSOLE_TARGET STREQUAL "durango")
   set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
diff --git a/README.md b/README.md
index e0f2ba40..d1a8343d 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkId=248929
 
 Copyright (c) Microsoft Corporation.
 
-## March 31, 2026
+## May 7, 2026
 
 This package contains the "DirectX Tool Kit", a collection of helper classes for writing Direct3D 11 C++ code for Win32 desktop applications for Windows 8.1 or later, Xbox One, and Universal Windows Platform (UWP) apps for Windows 10 and Windows 11.
 
diff --git a/Src/DDS.h b/Src/DDS.h
index c668beba..f5375df5 100644
--- a/Src/DDS.h
+++ b/Src/DDS.h
@@ -11,7 +11,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 //
-// http://go.microsoft.com/fwlink/?LinkId=248926
+// https://go.microsoft.com/fwlink/?LinkId=248926
 // https://go.microsoft.com/fwlink/?LinkId=248929
 // https://go.microsoft.com/fwlink/?LinkID=615561
 //--------------------------------------------------------------------------------------
diff --git a/build/CompilerAndLinker.cmake b/build/CompilerAndLinker.cmake
index b096663a..9e69cd83 100644
--- a/build/CompilerAndLinker.cmake
+++ b/build/CompilerAndLinker.cmake
@@ -67,7 +67,7 @@ endif()
 
 #--- General MSVC-like SDL options
 if(MSVC)
-    list(APPEND COMPILER_SWITCHES "$<$<NOT:$<CONFIG:DEBUG>>:/guard:cf>")
+    list(APPEND COMPILER_SWITCHES /Gd /GS /Zc:forScope /Zc:inline /Zc:wchar_t $<$<NOT:$<CONFIG:DEBUG>>:/guard:cf>)
     list(APPEND LINKER_SWITCHES /DYNAMICBASE /NXCOMPAT /INCREMENTAL:NO)
 
     if(WINDOWS_STORE)
@@ -130,7 +130,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|IntelLLVM")
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
     list(APPEND COMPILER_SWITCHES /Zc:__cplusplus /Zc:inline /fp:fast /Qdiag-disable:161)
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-    list(APPEND COMPILER_SWITCHES /sdl /Zc:forScope /Zc:inline /Zc:wchar_t /fp:fast)
+    list(APPEND COMPILER_SWITCHES /sdl /fp:fast)
 
     if(WINDOWS_STORE)
       list(APPEND COMPILER_SWITCHES /await)