diff --git a/include/etl/queue.h b/include/etl/queue.h
index bc2ae1a9..15ded9bd 100644
--- a/include/etl/queue.h
+++ b/include/etl/queue.h
@@ -119,7 +119,7 @@ namespace etl
     //*************************************************************************
     /// Returns the maximum number of items that can be queued.
     //*************************************************************************
-    ETL_CONSTEXPR size_type max_size() const
+    size_type max_size() const
     {
       return CAPACITY;
     }
@@ -127,7 +127,7 @@ namespace etl
     //*************************************************************************
     /// Returns the maximum number of items that can be queued.
     //*************************************************************************
-    ETL_CONSTEXPR size_type capacity() const
+    size_type capacity() const
     {
       return CAPACITY;
     }
diff --git a/include/etl/queue_mpmc_mutex.h b/include/etl/queue_mpmc_mutex.h
index 03ef4005..f6951406 100644
--- a/include/etl/queue_mpmc_mutex.h
+++ b/include/etl/queue_mpmc_mutex.h
@@ -51,7 +51,7 @@ namespace etl
     //*************************************************************************
     /// How many items can the queue hold.
     //*************************************************************************
-    ETL_CONSTEXPR size_t capacity() const
+    size_t capacity() const
     {
       return MAX_SIZE;
     }
@@ -59,7 +59,7 @@ namespace etl
     //*************************************************************************
     /// How many items can the queue hold.
     //*************************************************************************
-    ETL_CONSTEXPR size_t max_size() const
+    size_t max_size() const
     {
       return MAX_SIZE;
     }
diff --git a/include/etl/queue_spsc_atomic.h b/include/etl/queue_spsc_atomic.h
index cc5e6f6d..dfe32fc0 100644
--- a/include/etl/queue_spsc_atomic.h
+++ b/include/etl/queue_spsc_atomic.h
@@ -105,7 +105,7 @@ namespace etl
     //*************************************************************************
     /// How many items can the queue hold.
     //*************************************************************************
-    ETL_CONSTEXPR size_t capacity() const
+    size_t capacity() const
     {
       return RESERVED - 1;
     }
@@ -113,7 +113,7 @@ namespace etl
     //*************************************************************************
     /// How many items can the queue hold.
     //*************************************************************************
-    ETL_CONSTEXPR size_t max_size() const
+    size_t max_size() const
     {
       return RESERVED - 1;
     }
diff --git a/include/etl/queue_spsc_isr.h b/include/etl/queue_spsc_isr.h
index b58333d6..2b89603d 100644
--- a/include/etl/queue_spsc_isr.h
+++ b/include/etl/queue_spsc_isr.h
@@ -131,7 +131,7 @@ namespace etl
     //*************************************************************************
     /// How many items can the queue hold.
     //*************************************************************************
-    ETL_CONSTEXPR size_t capacity() const
+    size_t capacity() const
     {
       return MAX_SIZE;
     }
@@ -139,7 +139,7 @@ namespace etl
     //*************************************************************************
     /// How many items can the queue hold.
     //*************************************************************************
-    ETL_CONSTEXPR size_t max_size() const
+    size_t max_size() const
     {
       return MAX_SIZE;
     }
diff --git a/include/etl/variant.h b/include/etl/variant.h
index 72ae6950..182e19c8 100644
--- a/include/etl/variant.h
+++ b/include/etl/variant.h
@@ -912,7 +912,7 @@ namespace etl
     //***************************************************************************
     /// Gets the index of the type currently stored or UNSUPPORTED_TYPE_ID
     //***************************************************************************
-    ETL_CONSTEXPR size_t index() const
+    size_t index() const
     {
       return type_id;
     }
diff --git a/include/etl/version.h b/include/etl/version.h
index 74abd073..85be9694 100644
--- a/include/etl/version.h
+++ b/include/etl/version.h
@@ -37,9 +37,9 @@ SOFTWARE.
 /// Definitions of the ETL version
 ///\ingroup utilities
 
-#define ETL_VERSION "11.6.0"
+#define ETL_VERSION "11.7.0"
 #define ETL_VERSION_MAJOR 11
-#define ETL_VERSION_MINOR  6
+#define ETL_VERSION_MINOR  7
 #define ETL_VERSION_PATCH  0
 
 #endif
diff --git a/support/Release notes.txt b/support/Release notes.txt
index d86df051..aedbe2fa 100644
--- a/support/Release notes.txt	
+++ b/support/Release notes.txt	
@@ -1,3 +1,10 @@
+===============================================================================
+11.7.0
+Modified header guards.
+Added etl::type_select
+Added etl::null_type
+
+===============================================================================
 11.6.0
 Added capacity() to etl::queue
 Prefixed max_size() and capacity() with ETL_CONSTEXPR in all queue types.
diff --git a/test/codeblocks/ETL.cbp b/test/codeblocks/ETL.cbp
index 454afa4e..65639955 100644
--- a/test/codeblocks/ETL.cbp
+++ b/test/codeblocks/ETL.cbp
@@ -157,6 +157,7 @@
 		<Unit filename="../../include/etl/multimap.h" />
 		<Unit filename="../../include/etl/multiset.h" />
 		<Unit filename="../../include/etl/murmur3.h" />
+		<Unit filename="../../include/etl/null_type.h" />
 		<Unit filename="../../include/etl/nullptr.h" />
 		<Unit filename="../../include/etl/numeric.h" />
 		<Unit filename="../../include/etl/observer.h" />