diff --git a/.vs/rufus.vcxproj b/.vs/rufus.vcxproj
index d35b90eb1a2..1a1d0cf0e3c 100644
--- a/.vs/rufus.vcxproj
+++ b/.vs/rufus.vcxproj
@@ -231,6 +231,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ExceptionHandling>false</ExceptionHandling>
       <DisableSpecificWarnings>4091;28252;28253;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <UndefinePreprocessorDefinitions>NDEBUG</UndefinePreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>advapi32.lib;comctl32.lib;comdlg32.lib;crypt32.lib;gdi32.lib;ole32.lib;setupapi.lib;shell32.lib;shlwapi.lib;wintrust.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -254,6 +255,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ExceptionHandling>false</ExceptionHandling>
       <DisableSpecificWarnings>4091;28252;28253;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <UndefinePreprocessorDefinitions>NDEBUG</UndefinePreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>advapi32.lib;comctl32.lib;comdlg32.lib;crypt32.lib;gdi32.lib;ole32.lib;setupapi.lib;shell32.lib;shlwapi.lib;wintrust.lib;ole32.lib;advapi32.lib;gdi32.lib;shell32.lib;comdlg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -279,6 +281,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ExceptionHandling>false</ExceptionHandling>
       <DisableSpecificWarnings>4091;28252;28253;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <UndefinePreprocessorDefinitions>NDEBUG</UndefinePreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>advapi32.lib;comctl32.lib;comdlg32.lib;crypt32.lib;gdi32.lib;ole32.lib;setupapi.lib;shell32.lib;shlwapi.lib;wintrust.lib;ole32.lib;advapi32.lib;gdi32.lib;shell32.lib;comdlg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -307,6 +310,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ExceptionHandling>false</ExceptionHandling>
       <DisableSpecificWarnings>4091;28252;28253;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <UndefinePreprocessorDefinitions>NDEBUG</UndefinePreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>advapi32.lib;comctl32.lib;comdlg32.lib;crypt32.lib;gdi32.lib;ole32.lib;setupapi.lib;shell32.lib;shlwapi.lib;wintrust.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/configure b/configure
index ed09b97429e..f348f9bc700 100755
--- a/configure
+++ b/configure
@@ -3894,7 +3894,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 CFLAGS="${saved_CFLAGS}"
 
-AM_CFLAGS="$AM_CFLAGS -DUNICODE -D_UNICODE -std=gnu99 -Wshadow -Wall -Wundef -Wunused -Wstrict-prototypes -Wno-restrict -Werror-implicit-function-declaration $nopointersign_cflags"
+AM_CFLAGS="$AM_CFLAGS -DUNICODE -D_UNICODE -UNDEBUG -std=gnu99 -Wshadow -Wall -Wundef -Wunused -Wstrict-prototypes -Wno-restrict -Werror-implicit-function-declaration $nopointersign_cflags"
 
 
 
diff --git a/configure.ac b/configure.ac
index 44372d1037e..87e0dd03b09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
 	[nopointersign_cflags="-Wno-pointer-sign"], [nopointersign_cflags=""])
 CFLAGS="${saved_CFLAGS}"
 
-AM_CFLAGS="$AM_CFLAGS -DUNICODE -D_UNICODE -std=gnu99 -Wshadow -Wall -Wundef -Wunused -Wstrict-prototypes -Wno-restrict -Werror-implicit-function-declaration $nopointersign_cflags"
+AM_CFLAGS="$AM_CFLAGS -DUNICODE -D_UNICODE -UNDEBUG -std=gnu99 -Wshadow -Wall -Wundef -Wunused -Wstrict-prototypes -Wno-restrict -Werror-implicit-function-declaration $nopointersign_cflags"
 
 AC_SUBST([VISIBILITY_CFLAGS])
 AC_SUBST([AM_CFLAGS])
diff --git a/src/dev.c b/src/dev.c
index be7f525bc9a..65d2b321f6d 100644
--- a/src/dev.c
+++ b/src/dev.c
@@ -32,7 +32,6 @@
 #include <inttypes.h>
 #include <commctrl.h>
 #include <setupapi.h>
-#undef NDEBUG
 #include <assert.h>
 
 #include "rufus.h"
diff --git a/src/dos_locale.c b/src/dos_locale.c
index 8dffe23e720..e524d2abb12 100644
--- a/src/dos_locale.c
+++ b/src/dos_locale.c
@@ -26,7 +26,6 @@
 #include <windows.h>
 #include <stdio.h>
 #include <string.h>
-#undef NDEBUG
 #include <assert.h>
 
 #include "rufus.h"
diff --git a/src/drive.c b/src/drive.c
index d72c173c160..16c4cec46d3 100644
--- a/src/drive.c
+++ b/src/drive.c
@@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#undef NDEBUG
 #include <assert.h>
 
 #include "rufus.h"
diff --git a/src/format.c b/src/format.c
index 339f076bf4e..003b54e31f9 100644
--- a/src/format.c
+++ b/src/format.c
@@ -31,7 +31,6 @@
 #include <stddef.h>
 #include <ctype.h>
 #include <locale.h>
-#undef NDEBUG
 #include <assert.h>
 
 #include "rufus.h"
diff --git a/src/net.c b/src/net.c
index 1ae3eb9df1c..1a1389364b5 100644
--- a/src/net.c
+++ b/src/net.c
@@ -29,7 +29,6 @@
 #include <malloc.h>
 #include <string.h>
 #include <inttypes.h>
-#undef NDEBUG
 #include <assert.h>
 
 #include "rufus.h"
diff --git a/src/pki.c b/src/pki.c
index 5ef2b5c040d..f38ff81a98e 100644
--- a/src/pki.c
+++ b/src/pki.c
@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <wincrypt.h>
 #include <wintrust.h>
-#undef NDEBUG
 #include <assert.h>
 
 #include "rufus.h"
diff --git a/src/rufus.c b/src/rufus.c
index ce0fc4a9cbc..d114b845b8a 100755
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -35,7 +35,6 @@
 #include <dbt.h>
 #include <io.h>
 #include <getopt.h>
-#undef NDEBUG
 #include <assert.h>
 
 #include "rufus.h"
@@ -1885,10 +1884,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
 	case WM_COMMAND:
 #ifdef RUFUS_TEST
 		if (LOWORD(wParam) == IDC_TEST) {
-			notification_info more_info;
-			more_info.id = MORE_INFO_URL;
-			more_info.url = SECURE_BOOT_MORE_INFO_URL;
-			Notification(MSG_INFO, SETTING_DISABLE_SECURE_BOOT_NOTICE, &more_info, lmprintf(MSG_128), lmprintf(MSG_129));
+			assert(1 == 0);
 			break;
 		}
 #endif
diff --git a/src/rufus.rc b/src/rufus.rc
index 55850e6cc1c..a501587a550 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.4.1424"
+CAPTION "Rufus 3.4.1425"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -394,8 +394,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,1424,0
- PRODUCTVERSION 3,4,1424,0
+ FILEVERSION 3,4,1425,0
+ PRODUCTVERSION 3,4,1425,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -413,13 +413,13 @@ BEGIN
             VALUE "Comments", "https://akeo.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.4.1424"
+            VALUE "FileVersion", "3.4.1425"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus-3.4.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.4.1424"
+            VALUE "ProductVersion", "3.4.1425"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/stdlg.c b/src/stdlg.c
index e1b343e8de0..7789abe9eab 100644
--- a/src/stdlg.c
+++ b/src/stdlg.c
@@ -31,7 +31,6 @@
 #include <shlobj.h>
 #include <commdlg.h>
 #include <richedit.h>
-#undef NDEBUG
 #include <assert.h>
 
 #include "rufus.h"
diff --git a/src/ui.c b/src/ui.c
index d45cc3dd22e..6baef922f08 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -29,7 +29,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <winioctl.h>
-#undef NDEBUG
 #include <assert.h>
 
 #include "rufus.h"