diff --git a/include/etl/platform.h b/include/etl/platform.h
index ebd8b6d9..7d6186e4 100644
--- a/include/etl/platform.h
+++ b/include/etl/platform.h
@@ -75,32 +75,24 @@ SOFTWARE.
 #if ETL_CPP11_SUPPORTED
   #define ETL_CONSTEXPR constexpr
   #define ETL_CONST     constexpr
+  #define ETL_DELETE    = delete
+  #define ETL_NOEXCEPT  noexcept
+  #define ETL_NOEXCEPT_EXPR(expression) noexcept(expression)
 #else
   #define ETL_CONSTEXPR
   #define ETL_CONST     const
+  #define ETL_DELETE
+  #define ETL_NOEXCEPT
+  #define ETL_NOEXCEPT_EXPR(expression)
 #endif
 
 #if ETL_CPP17_SUPPORTED
   #define ETL_CONSTEXPR17 constexpr
   #define ETL_IF_CONSTEXPR constexpr
+  #define ETL_NODISCARD [[nodiscard]]
 #else
   #define ETL_CONSTEXPR17
   #define ETL_IF_CONSTEXPR
-#endif
-
-#if ETL_CPP11_SUPPORTED
-  #define ETL_DELETE = delete
-#else
-  #define ETL_DELETE
-#endif
-
-#if ETL_CPP11_SUPPORTED
-  #define ETL_NOEXCEPT noexcept
-  #define ETL_NOEXCEPT_EXPR(expression) noexcept(expression)
-  #define ETL_NODISCARD [[nodiscard]]
-#else
-  #define ETL_NOEXCEPT
-  #define ETL_NOEXCEPT_EXPR(expression)
   #define ETL_NODISCARD
 #endif
 
@@ -110,10 +102,4 @@ SOFTWARE.
   #define ETL_EXPLICIT_STRING_FROM_CHAR
 #endif
 
-#if defined(ETL_FORCE_EXPLICIT_STRING_CONVERSION_FROM_CHAR)
-  #define ETL_EXPLICIT_STRING_FROM_CHAR explicit
-#else
-  #define ETL_EXPLICIT_STRING_FROM_CHAR
-#endif
-
 #endif
diff --git a/include/etl/version.h b/include/etl/version.h
index 6b3a1072..f8bcedf0 100644
--- a/include/etl/version.h
+++ b/include/etl/version.h
@@ -39,7 +39,7 @@ SOFTWARE.
 
 #define ETL_VERSION_MAJOR 15
 #define ETL_VERSION_MINOR  4
-#define ETL_VERSION_PATCH  0
+#define ETL_VERSION_PATCH  1
 
 #define ETL_VERSION       ETL_STRINGIFY(ETL_VERSION_MAJOR) "." ETL_STRINGIFY(ETL_VERSION_MINOR) "." ETL_STRINGIFY(ETL_VERSION_PATCH)
 #define ETL_VERSION_W     ETL_STRINGIFY(ETL_VERSION_MAJOR) L"." ETL_STRINGIFY(ETL_VERSION_MINOR) L"." ETL_STRINGIFY(ETL_VERSION_PATCH)
diff --git a/library.json b/library.json
index 8dbb6aa5..d8ca9025 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "Embedded Template Library",
-  "version": "15.4.0",
+  "version": "15.4.1",
   "authors": {
     "name": "John Wellbelove",
     "email": "<john.wellbelove@etlcpp.com>"
diff --git a/library.properties b/library.properties
index b4b2e6d6..92d177d4 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=Embedded Template Library
-version=15.4.0
+version=15.4.1
 author= John Wellbelove <john.wellbelove@etlcpp.com>
 maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
 license=MIT
diff --git a/support/Release notes.txt b/support/Release notes.txt
index 3c121b78..562ad0c3 100644
--- a/support/Release notes.txt	
+++ b/support/Release notes.txt	
@@ -1,3 +1,7 @@
+===============================================================================
+15.4.1
+Move ETL_NODISCARD definition to ETL_CPP17_SUPPORTED test
+
 ===============================================================================
 15.4.0
 Refactored CRC classes for better code sharing and reduced resource requirements
diff --git a/test/vs2017/etl.vcxproj.filters b/test/vs2017/etl.vcxproj.filters
index 285dce65..16c1c10c 100644
--- a/test/vs2017/etl.vcxproj.filters
+++ b/test/vs2017/etl.vcxproj.filters
@@ -1352,6 +1352,9 @@
     <None Include="..\..\library.json">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="..\..\.circleci\config.yml">
+      <Filter>Resource Files\CI\CircleCI</Filter>
+    </None>
     <None Include="..\..\README.md">
       <Filter>Resource Files</Filter>
     </None>