diff --git a/include/etl/profiles/gcc_generic.h b/include/etl/profiles/gcc_generic.h
index 39826014..74fba031 100644
--- a/include/etl/profiles/gcc_generic.h
+++ b/include/etl/profiles/gcc_generic.h
@@ -41,7 +41,7 @@ SOFTWARE.
 #ifdef __cplusplus
   #define ETL_CPP11_SUPPORTED                      (__cplusplus >= 201103L)
   #define ETL_CPP14_SUPPORTED                      (__cplusplus >= 201402L)
-  #define ETL_CPP17_SUPPORTED                      0
+  #define ETL_CPP17_SUPPORTED                      (__cplusplus >= 201703L)
 #else
   #define ETL_CPP11_SUPPORTED                      0
   #define ETL_CPP14_SUPPORTED                      0
diff --git a/include/etl/profiles/gcc_linux_x86.h b/include/etl/profiles/gcc_linux_x86.h
index c9a3c9cc..24ab6c68 100644
--- a/include/etl/profiles/gcc_linux_x86.h
+++ b/include/etl/profiles/gcc_linux_x86.h
@@ -41,7 +41,7 @@ SOFTWARE.
 #ifdef __cplusplus
   #define ETL_CPP11_SUPPORTED                      (__cplusplus >= 201103L)
   #define ETL_CPP14_SUPPORTED                      (__cplusplus >= 201402L)
-  #define ETL_CPP17_SUPPORTED                      0
+  #define ETL_CPP17_SUPPORTED                      (__cplusplus >= 201703L)
 #else
   #define ETL_CPP11_SUPPORTED                      0
   #define ETL_CPP14_SUPPORTED                      0
diff --git a/include/etl/profiles/gcc_windows_x86.h b/include/etl/profiles/gcc_windows_x86.h
index a5a83349..c04151d9 100644
--- a/include/etl/profiles/gcc_windows_x86.h
+++ b/include/etl/profiles/gcc_windows_x86.h
@@ -41,7 +41,7 @@ SOFTWARE.
 #ifdef __cplusplus
   #define ETL_CPP11_SUPPORTED                      (__cplusplus >= 201103L)
   #define ETL_CPP14_SUPPORTED                      (__cplusplus >= 201402L)
-  #define ETL_CPP17_SUPPORTED                      0
+  #define ETL_CPP17_SUPPORTED                      (__cplusplus >= 201703L)
 #else
   #define ETL_CPP11_SUPPORTED                      0
   #define ETL_CPP14_SUPPORTED                      0
diff --git a/include/etl/profiles/segger_gcc_stlport.h b/include/etl/profiles/segger_gcc_stlport.h
index c626bb29..45a0d844 100644
--- a/include/etl/profiles/segger_gcc_stlport.h
+++ b/include/etl/profiles/segger_gcc_stlport.h
@@ -41,7 +41,7 @@ SOFTWARE.
 #ifdef __cplusplus
   #define ETL_CPP11_SUPPORTED                      (__cplusplus >= 201103L)
   #define ETL_CPP14_SUPPORTED                      (__cplusplus >= 201402L)
-  #define ETL_CPP17_SUPPORTED                      0
+  #define ETL_CPP17_SUPPORTED                      (__cplusplus >= 201703L)
 #else
   #define ETL_CPP11_SUPPORTED                      0
   #define ETL_CPP14_SUPPORTED                      0
diff --git a/support/Release notes.txt b/support/Release notes.txt
index a678831c..5a6d8671 100644
--- a/support/Release notes.txt	
+++ b/support/Release notes.txt	
@@ -1,10 +1,10 @@
 ===============================================================================
 14.13.0
-Changed API for etl::queue_spsc_isr
+Added etl::queue_spsc_locked with injected locking functions.
 
 ===============================================================================
 14.12.0
-Enabled emplace functions for C++03.
+Enabled emplace functions for 'No STL'.
 
 ===============================================================================
 14.11.3
diff --git a/test/codeblocks/ETL.cbp b/test/codeblocks/ETL.cbp
index c573df20..17829a76 100644
--- a/test/codeblocks/ETL.cbp
+++ b/test/codeblocks/ETL.cbp
@@ -410,6 +410,8 @@
 		<Unit filename="../test_queue_spsc_atomic_small.cpp" />
 		<Unit filename="../test_queue_spsc_isr.cpp" />
 		<Unit filename="../test_queue_spsc_isr_small.cpp" />
+		<Unit filename="../test_queue_spsc_locked.cpp" />
+		<Unit filename="../test_queue_spsc_locked_small.cpp" />
 		<Unit filename="../test_random.cpp" />
 		<Unit filename="../test_reference_flat_map.cpp" />
 		<Unit filename="../test_reference_flat_multimap.cpp" />