diff --git a/include/comms/field/adapter/RemLengthMemberField.h b/include/comms/field/adapter/RemLengthMemberField.h
index 1336e8f..7880d8a 100644
--- a/include/comms/field/adapter/RemLengthMemberField.h
+++ b/include/comms/field/adapter/RemLengthMemberField.h
@@ -17,6 +17,9 @@
 #include "comms/util/type_traits.h"
 #include "comms/details/tag.h"
 
+COMMS_MSVC_WARNING_PUSH
+COMMS_MSVC_WARNING_DISABLE(4127) // Disable warning about constant conditional expressions
+
 namespace comms
 {
 
@@ -409,5 +412,5 @@ class RemLengthMemberField : public TBase
 
 }  // namespace comms
 
-
+COMMS_MSVC_WARNING_POP
 
diff --git a/include/comms/version.h b/include/comms/version.h
index 6c23b71..2ad03a3 100644
--- a/include/comms/version.h
+++ b/include/comms/version.h
@@ -17,7 +17,7 @@
 #define COMMS_MINOR_VERSION 2U
 
 /// @brief Patch level of the library
-#define COMMS_PATCH_VERSION 4U
+#define COMMS_PATCH_VERSION 5U
 
 /// @brief Macro to create numeric version as single unsigned number
 #define COMMS_MAKE_VERSION(major_, minor_, patch_) \