diff --git a/checks/Jamfile.v2 b/checks/Jamfile.v2
index a16bef5cc..3f9424e03 100644
--- a/checks/Jamfile.v2
+++ b/checks/Jamfile.v2
@@ -1,6 +1,6 @@
 #
 # *** DO NOT EDIT THIS FILE BY HAND ***
-# This file was automatically generated on Fri Oct 13 19:09:38 2023
+# This file was automatically generated on Mon Jan 22 16:16:53 2024
 #  by libs/config/tools/generate.cpp
 # Copyright John Maddock.
 # Use, modification and distribution are subject to the 
@@ -119,6 +119,7 @@ obj cxx14_return_type_deduction : test_case.cpp : <define>TEST_BOOST_NO_CXX14_RE
 obj cxx14_std_exchange : test_case.cpp : <define>TEST_BOOST_NO_CXX14_STD_EXCHANGE ;
 obj cxx14_variable_templates : test_case.cpp : <define>TEST_BOOST_NO_CXX14_VARIABLE_TEMPLATES ;
 obj cxx17 : test_case.cpp : <define>TEST_BOOST_NO_CXX17 ;
+obj cxx17_auto_nontype_template_params : test_case.cpp : <define>TEST_BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS ;
 obj cxx17_deduction_guides : test_case.cpp : <define>TEST_BOOST_NO_CXX17_DEDUCTION_GUIDES ;
 obj cxx17_fold_expressions : test_case.cpp : <define>TEST_BOOST_NO_CXX17_FOLD_EXPRESSIONS ;
 obj cxx17_hdr_any : test_case.cpp : <define>TEST_BOOST_NO_CXX17_HDR_ANY ;
diff --git a/checks/test_case.cpp b/checks/test_case.cpp
index ca724b462..ceb82e01d 100644
--- a/checks/test_case.cpp
+++ b/checks/test_case.cpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Fri Oct 13 19:09:38 2023
+//  This file was automatically generated on Mon Jan 22 16:16:53 2024
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-21.
 //  Use, modification and distribution are subject to the 
@@ -551,6 +551,11 @@
 #     error "Defect macro BOOST_NO_CXX17 is defined."
 #  endif
 #endif
+#ifdef TEST_BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#  ifdef BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#     error "Defect macro BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS is defined."
+#  endif
+#endif
 #ifdef TEST_BOOST_NO_CXX17_DEDUCTION_GUIDES
 #  ifdef BOOST_NO_CXX17_DEDUCTION_GUIDES
 #     error "Defect macro BOOST_NO_CXX17_DEDUCTION_GUIDES is defined."
diff --git a/doc/macro_reference.qbk b/doc/macro_reference.qbk
index 80164e259..728b5c8f0 100644
--- a/doc/macro_reference.qbk
+++ b/doc/macro_reference.qbk
@@ -1027,6 +1027,7 @@ that are not yet supported by a particular compiler or library.
 [[`BOOST_NO_CXX17_IF_CONSTEXPR`][The compiler does not support `if constexpr`.]]
 [[`BOOST_NO_CXX17_INLINE_VARIABLES`][The compiler does not support `inline` variables.]]
 [[`BOOST_NO_CXX17_DEDUCTION_GUIDES`][The compiler does not support class template argument deduction (CTAD) guides.]]
+[[`BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS`][The compiler does not support `auto` non-type template parameters.]]
 ]
 
 [endsect]
diff --git a/include/boost/config/assert_cxx03.hpp b/include/boost/config/assert_cxx03.hpp
index c914aa86f..ddc05b117 100644
--- a/include/boost/config/assert_cxx03.hpp
+++ b/include/boost/config/assert_cxx03.hpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Fri Oct 13 19:09:38 2023
+//  This file was automatically generated on Mon Jan 22 16:16:53 2024
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-21.
 //  Use, modification and distribution are subject to the 
diff --git a/include/boost/config/assert_cxx11.hpp b/include/boost/config/assert_cxx11.hpp
index addd06ad8..a02b17058 100644
--- a/include/boost/config/assert_cxx11.hpp
+++ b/include/boost/config/assert_cxx11.hpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Fri Oct 13 19:09:38 2023
+//  This file was automatically generated on Mon Jan 22 16:16:53 2024
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-21.
 //  Use, modification and distribution are subject to the 
diff --git a/include/boost/config/assert_cxx14.hpp b/include/boost/config/assert_cxx14.hpp
index 061aba3f1..d6349014c 100644
--- a/include/boost/config/assert_cxx14.hpp
+++ b/include/boost/config/assert_cxx14.hpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Fri Oct 13 19:09:38 2023
+//  This file was automatically generated on Mon Jan 22 16:16:53 2024
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-21.
 //  Use, modification and distribution are subject to the 
diff --git a/include/boost/config/assert_cxx17.hpp b/include/boost/config/assert_cxx17.hpp
index ffa1ae918..289ba71d1 100644
--- a/include/boost/config/assert_cxx17.hpp
+++ b/include/boost/config/assert_cxx17.hpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Fri Oct 13 19:09:38 2023
+//  This file was automatically generated on Mon Jan 22 16:16:53 2024
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-21.
 //  Use, modification and distribution are subject to the 
@@ -12,6 +12,9 @@
 #include <boost/config.hpp>
 #include <boost/config/assert_cxx14.hpp>
 
+#ifdef BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#  error "Your compiler appears not to be fully C++17 compliant.  Detected via defect macro BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS."
+#endif
 #ifdef BOOST_NO_CXX17_DEDUCTION_GUIDES
 #  error "Your compiler appears not to be fully C++17 compliant.  Detected via defect macro BOOST_NO_CXX17_DEDUCTION_GUIDES."
 #endif
diff --git a/include/boost/config/assert_cxx20.hpp b/include/boost/config/assert_cxx20.hpp
index 71a74154f..c1ac309ef 100644
--- a/include/boost/config/assert_cxx20.hpp
+++ b/include/boost/config/assert_cxx20.hpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Fri Oct 13 19:09:38 2023
+//  This file was automatically generated on Mon Jan 22 16:16:53 2024
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-21.
 //  Use, modification and distribution are subject to the 
diff --git a/include/boost/config/assert_cxx23.hpp b/include/boost/config/assert_cxx23.hpp
index feb445737..2b18da995 100644
--- a/include/boost/config/assert_cxx23.hpp
+++ b/include/boost/config/assert_cxx23.hpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Fri Oct 13 19:09:38 2023
+//  This file was automatically generated on Mon Jan 22 16:16:53 2024
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-21.
 //  Use, modification and distribution are subject to the 
diff --git a/include/boost/config/compiler/borland.hpp b/include/boost/config/compiler/borland.hpp
index 567636c5b..51d518869 100644
--- a/include/boost/config/compiler/borland.hpp
+++ b/include/boost/config/compiler/borland.hpp
@@ -245,6 +245,9 @@
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 
 #if __BORLANDC__ >= 0x590
 #  define BOOST_HAS_TR1_HASH
diff --git a/include/boost/config/compiler/clang.hpp b/include/boost/config/compiler/clang.hpp
index 1eeed315d..f9a5050b4 100644
--- a/include/boost/config/compiler/clang.hpp
+++ b/include/boost/config/compiler/clang.hpp
@@ -321,6 +321,10 @@
 #  define BOOST_NO_CXX17_FOLD_EXPRESSIONS
 #endif
 
+#if (__clang_major__ < 4) || (__cplusplus < 201406L) /* non-standard value that is greater than 201402, which is reported by clang 4.0.0 for C++1z */
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
+
 #if __cplusplus < 201103L
 #define BOOST_NO_CXX11_SFINAE_EXPR
 #endif
diff --git a/include/boost/config/compiler/codegear.hpp b/include/boost/config/compiler/codegear.hpp
index 4d3f42aef..49f934c02 100644
--- a/include/boost/config/compiler/codegear.hpp
+++ b/include/boost/config/compiler/codegear.hpp
@@ -316,6 +316,10 @@
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
 
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
+
 //
 // TR1 macros:
 //
diff --git a/include/boost/config/compiler/common_edg.hpp b/include/boost/config/compiler/common_edg.hpp
index dc049893c..0d59ae0e6 100644
--- a/include/boost/config/compiler/common_edg.hpp
+++ b/include/boost/config/compiler/common_edg.hpp
@@ -171,10 +171,12 @@
 #if !defined(__cpp_fold_expressions) || (__cpp_fold_expressions < 201603)
 #  define BOOST_NO_CXX17_FOLD_EXPRESSIONS
 #endif
-
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 
 #ifdef c_plusplus
 // EDG has "long long" in non-strict mode
diff --git a/include/boost/config/compiler/digitalmars.hpp b/include/boost/config/compiler/digitalmars.hpp
index bb56ff6c0..4fa347ab8 100644
--- a/include/boost/config/compiler/digitalmars.hpp
+++ b/include/boost/config/compiler/digitalmars.hpp
@@ -130,6 +130,9 @@
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 
 #if (__DMC__ <= 0x840)
 #error "Compiler not supported or configured - please reconfigure"
diff --git a/include/boost/config/compiler/gcc.hpp b/include/boost/config/compiler/gcc.hpp
index 2f1fe5508..fc05a9186 100644
--- a/include/boost/config/compiler/gcc.hpp
+++ b/include/boost/config/compiler/gcc.hpp
@@ -319,6 +319,9 @@
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if (__GNUC__ < 7) || (__cplusplus < 201703L)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 
 #if __GNUC__ >= 7
 #  define BOOST_FALLTHROUGH __attribute__((fallthrough))
diff --git a/include/boost/config/compiler/gcc_xml.hpp b/include/boost/config/compiler/gcc_xml.hpp
index 75cac44e9..e23b14d0f 100644
--- a/include/boost/config/compiler/gcc_xml.hpp
+++ b/include/boost/config/compiler/gcc_xml.hpp
@@ -108,7 +108,8 @@
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 
 #define BOOST_COMPILER "GCC-XML C++ version " __GCCXML__
-
-
diff --git a/include/boost/config/compiler/hp_acc.hpp b/include/boost/config/compiler/hp_acc.hpp
index 25636324b..42e35e553 100644
--- a/include/boost/config/compiler/hp_acc.hpp
+++ b/include/boost/config/compiler/hp_acc.hpp
@@ -137,6 +137,10 @@
   #define BOOST_NO_CXX11_VARIADIC_MACROS
 #endif
 
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
+
 #endif
 
 //
diff --git a/include/boost/config/compiler/metrowerks.hpp b/include/boost/config/compiler/metrowerks.hpp
index 448ab67bc..c38efb321 100644
--- a/include/boost/config/compiler/metrowerks.hpp
+++ b/include/boost/config/compiler/metrowerks.hpp
@@ -173,6 +173,9 @@
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 
 #define BOOST_COMPILER "Metrowerks CodeWarrior C++ version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)
 
diff --git a/include/boost/config/compiler/mpw.hpp b/include/boost/config/compiler/mpw.hpp
index 8433f3719..3adb61221 100644
--- a/include/boost/config/compiler/mpw.hpp
+++ b/include/boost/config/compiler/mpw.hpp
@@ -122,6 +122,9 @@
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 
 //
 // versions check:
diff --git a/include/boost/config/compiler/nvcc.hpp b/include/boost/config/compiler/nvcc.hpp
index 419dd724a..147f75dbf 100644
--- a/include/boost/config/compiler/nvcc.hpp
+++ b/include/boost/config/compiler/nvcc.hpp
@@ -57,5 +57,8 @@
 #  define BOOST_NO_CXX11_NOEXCEPT
 #endif
 
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
 #endif
 
+#endif
diff --git a/include/boost/config/compiler/pathscale.hpp b/include/boost/config/compiler/pathscale.hpp
index 5348cf7f7..59ab9b007 100644
--- a/include/boost/config/compiler/pathscale.hpp
+++ b/include/boost/config/compiler/pathscale.hpp
@@ -135,4 +135,7 @@
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 #endif
diff --git a/include/boost/config/compiler/sunpro_cc.hpp b/include/boost/config/compiler/sunpro_cc.hpp
index 490dc76dc..334b604bb 100644
--- a/include/boost/config/compiler/sunpro_cc.hpp
+++ b/include/boost/config/compiler/sunpro_cc.hpp
@@ -194,6 +194,9 @@
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 
 // Turn on threading support for Solaris 12.
 // Ticket #11972
diff --git a/include/boost/config/compiler/vacpp.hpp b/include/boost/config/compiler/vacpp.hpp
index 9cfa1adf8..3794d3601 100644
--- a/include/boost/config/compiler/vacpp.hpp
+++ b/include/boost/config/compiler/vacpp.hpp
@@ -184,3 +184,6 @@
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp
index c0ada098a..ce0fc15e3 100644
--- a/include/boost/config/compiler/visualc.hpp
+++ b/include/boost/config/compiler/visualc.hpp
@@ -263,6 +263,9 @@
 #define BOOST_NO_CXX17_INLINE_VARIABLES
 #define BOOST_NO_CXX17_FOLD_EXPRESSIONS
 #endif
+#if (_MSC_VER < 1914) || (_MSVC_LANG < 201703)
+#define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 
 //
 // Things that don't work in clr mode:
diff --git a/include/boost/config/compiler/xlcpp.hpp b/include/boost/config/compiler/xlcpp.hpp
index 99b8b2455..4a4477d9d 100644
--- a/include/boost/config/compiler/xlcpp.hpp
+++ b/include/boost/config/compiler/xlcpp.hpp
@@ -265,6 +265,10 @@
 #  define BOOST_NO_CXX17_FOLD_EXPRESSIONS
 #endif
 
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
+
 #if !__has_feature(cxx_thread_local)
 #  define BOOST_NO_CXX11_THREAD_LOCAL
 #endif
diff --git a/include/boost/config/compiler/xlcpp_zos.hpp b/include/boost/config/compiler/xlcpp_zos.hpp
index 9a177f1bb..0b288a880 100644
--- a/include/boost/config/compiler/xlcpp_zos.hpp
+++ b/include/boost/config/compiler/xlcpp_zos.hpp
@@ -157,6 +157,7 @@
 #define BOOST_NO_CXX17_INLINE_VARIABLES
 #define BOOST_NO_CXX17_FOLD_EXPRESSIONS
 #define BOOST_NO_CXX17_IF_CONSTEXPR
+#define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
 
 // -------------------------------------
 
diff --git a/include/boost/config/detail/cxx_composite.hpp b/include/boost/config/detail/cxx_composite.hpp
index 9c2c01ead..a0daaad78 100644
--- a/include/boost/config/detail/cxx_composite.hpp
+++ b/include/boost/config/detail/cxx_composite.hpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Fri Oct 13 19:09:38 2023
+//  This file was automatically generated on Mon Jan 22 16:16:53 2024
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-21.
 //  Use, modification and distribution are subject to the 
@@ -164,6 +164,7 @@
 #endif
 
 #if defined(BOOST_NO_CXX14)\
+   || defined(BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS)\
    || defined(BOOST_NO_CXX17_DEDUCTION_GUIDES)\
    || defined(BOOST_NO_CXX17_FOLD_EXPRESSIONS)\
    || defined(BOOST_NO_CXX17_HDR_ANY)\
diff --git a/test/all/Jamfile.v2 b/test/all/Jamfile.v2
index 3f97d6245..de06b1875 100644
--- a/test/all/Jamfile.v2
+++ b/test/all/Jamfile.v2
@@ -1,7 +1,7 @@
 #
 # Regression test Jamfile for boost configuration setup.
 # *** DO NOT EDIT THIS FILE BY HAND ***
-# This file was automatically generated on Fri Oct 13 19:09:38 2023
+# This file was automatically generated on Mon Jan 22 16:16:53 2024
 #  by libs/config/tools/generate.cpp
 # Copyright John Maddock.
 # Use, modification and distribution are subject to the 
@@ -346,6 +346,9 @@ test-suite "BOOST_NO_CXX14_VARIABLE_TEMPLATES" :
 test-suite "BOOST_NO_CXX17" : 
 [ run ../no_cxx17_pass.cpp ]
 [ compile-fail ../no_cxx17_fail.cpp ] ;
+test-suite "BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS" : 
+[ run ../no_cxx17_auto_nontype_template_params_pass.cpp ]
+[ compile-fail ../no_cxx17_auto_nontype_template_params_fail.cpp ] ;
 test-suite "BOOST_NO_CXX17_DEDUCTION_GUIDES" : 
 [ run ../no_cxx17_deduction_guides_pass.cpp ]
 [ compile-fail ../no_cxx17_deduction_guides_fail.cpp ] ;
diff --git a/test/boost_no_cxx17_auto_nontype_template_params.ipp b/test/boost_no_cxx17_auto_nontype_template_params.ipp
new file mode 100644
index 000000000..384273a73
--- /dev/null
+++ b/test/boost_no_cxx17_auto_nontype_template_params.ipp
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 Andrey Semashev
+ *
+ * Distributed under Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ */
+
+ // MACRO: BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+ // TITLE: C++17 auto non-type template parameters
+ // DESCRIPTION: C++17 auto non-type template parameters are not supported.
+
+namespace boost_no_cxx17_auto_nontype_template_params {
+
+template< auto Value >
+struct foo
+{
+    static auto get()
+    {
+        return Value;
+    }
+};
+
+const int ten = 10;
+
+int test()
+{
+    return foo< 10 >::get() - *foo< &ten >::get();
+}
+
+} // boost_no_cxx17_auto_nontype_template_params
diff --git a/test/config_info.cpp b/test/config_info.cpp
index 4825470c4..6198da8ff 100644
--- a/test/config_info.cpp
+++ b/test/config_info.cpp
@@ -1168,6 +1168,7 @@ void print_boost_macros()
    PRINT_MACRO(BOOST_NO_CXX14_STD_EXCHANGE);
    PRINT_MACRO(BOOST_NO_CXX14_VARIABLE_TEMPLATES);
    PRINT_MACRO(BOOST_NO_CXX17);
+   PRINT_MACRO(BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS);
    PRINT_MACRO(BOOST_NO_CXX17_DEDUCTION_GUIDES);
    PRINT_MACRO(BOOST_NO_CXX17_FOLD_EXPRESSIONS);
    PRINT_MACRO(BOOST_NO_CXX17_HDR_ANY);
@@ -1287,6 +1288,7 @@ void print_boost_macros()
 
 
 
+
    // END GENERATED BLOCK
 
    PRINT_MACRO(BOOST_CXX_VERSION);
diff --git a/test/config_test.cpp b/test/config_test.cpp
index 8cb33d36d..273ce6cc6 100644
--- a/test/config_test.cpp
+++ b/test/config_test.cpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Fri Oct 13 19:09:38 2023
+//  This file was automatically generated on Mon Jan 22 16:16:53 2024
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-21.
 //  Use, modification and distribution are subject to the 
@@ -377,6 +377,11 @@ namespace boost_no_cxx14_variable_templates = empty_boost;
 #else
 namespace boost_no_cxx17 = empty_boost;
 #endif
+#ifndef BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#include "boost_no_cxx17_auto_nontype_template_params.ipp"
+#else
+namespace boost_no_cxx17_auto_nontype_template_params = empty_boost;
+#endif
 #ifndef BOOST_NO_CXX17_DEDUCTION_GUIDES
 #include "boost_no_cxx17_deduction_guides.ipp"
 #else
@@ -1741,6 +1746,11 @@ int main( int, char *[] )
       std::cerr << "Failed test for BOOST_NO_CXX17 at: " << __FILE__ << ":" << __LINE__ << std::endl;
       ++error_count;
    }
+   if(0 != boost_no_cxx17_auto_nontype_template_params::test())
+   {
+      std::cerr << "Failed test for BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
    if(0 != boost_no_cxx17_deduction_guides::test())
    {
       std::cerr << "Failed test for BOOST_NO_CXX17_DEDUCTION_GUIDES at: " << __FILE__ << ":" << __LINE__ << std::endl;
diff --git a/test/no_cxx17_auto_nontype_template_params_fail.cpp b/test/no_cxx17_auto_nontype_template_params_fail.cpp
new file mode 100644
index 000000000..81bb8dda9
--- /dev/null
+++ b/test/no_cxx17_auto_nontype_template_params_fail.cpp
@@ -0,0 +1,37 @@
+//  This file was automatically generated on Mon Jan 22 16:16:53 2024
+//  by libs/config/tools/generate.cpp
+//  Copyright John Maddock 2002-21.
+//  Use, modification and distribution are subject to the 
+//  Boost Software License, Version 1.0. (See accompanying file 
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org/libs/config for the most recent version.//
+//  Revision $Id$
+//
+
+
+// Test file for macro BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+// This file should not compile, if it does then
+// BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS should not be defined.
+// See file boost_no_cxx17_auto_nontype_template_params.ipp for details
+
+// Must not have BOOST_ASSERT_CONFIG set; it defeats
+// the objective of this file:
+#ifdef BOOST_ASSERT_CONFIG
+#  undef BOOST_ASSERT_CONFIG
+#endif
+
+#include <boost/config.hpp>
+#include "test.hpp"
+
+#ifdef BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#include "boost_no_cxx17_auto_nontype_template_params.ipp"
+#else
+#error "this file should not compile"
+#endif
+
+int main( int, char *[] )
+{
+   return boost_no_cxx17_auto_nontype_template_params::test();
+}
+
diff --git a/test/no_cxx17_auto_nontype_template_params_pass.cpp b/test/no_cxx17_auto_nontype_template_params_pass.cpp
new file mode 100644
index 000000000..2910e8f72
--- /dev/null
+++ b/test/no_cxx17_auto_nontype_template_params_pass.cpp
@@ -0,0 +1,37 @@
+//  This file was automatically generated on Mon Jan 22 16:16:53 2024
+//  by libs/config/tools/generate.cpp
+//  Copyright John Maddock 2002-21.
+//  Use, modification and distribution are subject to the 
+//  Boost Software License, Version 1.0. (See accompanying file 
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org/libs/config for the most recent version.//
+//  Revision $Id$
+//
+
+
+// Test file for macro BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+// This file should compile, if it does not then
+// BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS should be defined.
+// See file boost_no_cxx17_auto_nontype_template_params.ipp for details
+
+// Must not have BOOST_ASSERT_CONFIG set; it defeats
+// the objective of this file:
+#ifdef BOOST_ASSERT_CONFIG
+#  undef BOOST_ASSERT_CONFIG
+#endif
+
+#include <boost/config.hpp>
+#include "test.hpp"
+
+#ifndef BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#include "boost_no_cxx17_auto_nontype_template_params.ipp"
+#else
+namespace boost_no_cxx17_auto_nontype_template_params = empty_boost;
+#endif
+
+int main( int, char *[] )
+{
+   return boost_no_cxx17_auto_nontype_template_params::test();
+}
+
diff --git a/tools/generate.cpp b/tools/generate.cpp
index 01b735970..a8595fbc5 100644
--- a/tools/generate.cpp
+++ b/tools/generate.cpp
@@ -14,6 +14,7 @@
 #include <boost/regex.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
 #include <boost/filesystem/fstream.hpp>
 #include <boost/detail/lightweight_main.hpp>
 #include <iostream>
@@ -267,10 +268,10 @@ void process_ipp_file(const fs::path& file, bool positive_test)
 
    // get the output filesnames:
    boost::regex file_regex("boost_([^.]+)\\.ipp");
-   positive_file = file.branch_path() / boost::regex_replace(file.leaf().string(), file_regex, "$1_pass.cpp");
-   negative_file = file.branch_path() / boost::regex_replace(file.leaf().string(), file_regex, "$1_fail.cpp");
-   write_test_file(positive_file, macro_name, namespace_name, file.leaf().string(), positive_test, true);
-   write_test_file(negative_file, macro_name, namespace_name, file.leaf().string(), positive_test, false);
+   positive_file = file.parent_path() / boost::regex_replace(file.filename().string(), file_regex, "$1_pass.cpp");
+   negative_file = file.parent_path() / boost::regex_replace(file.filename().string(), file_regex, "$1_fail.cpp");
+   write_test_file(positive_file, macro_name, namespace_name, file.filename().string(), positive_test, true);
+   write_test_file(negative_file, macro_name, namespace_name, file.filename().string(), positive_test, false);
    
    // always create config_test data,
    // positive and negative tests go to separate streams, because for some
@@ -280,7 +281,7 @@ void process_ipp_file(const fs::path& file, bool positive_test)
    if(!positive_test)
       *pout << "n";
    *pout << "def " << macro_name 
-      << "\n#include \"" << file.leaf().string() << "\"\n#else\nnamespace "
+      << "\n#include \"" << file.filename().string() << "\"\n#else\nnamespace "
       << namespace_name << " = empty_boost;\n#endif\n";
 
    config_test2 << "   if(0 != " << namespace_name << "::test())\n"
@@ -291,12 +292,12 @@ void process_ipp_file(const fs::path& file, bool positive_test)
 
    // always generate the jamfile data:
    jamfile << "test-suite \"" << macro_name << "\" : \n"
-      "[ run " << positive_file.leaf().string() << " <template>config_options ]\n"
-      "[ compile-fail " << negative_file.leaf().string() << " <template>config_options ] ;\n";
+      "[ run " << positive_file.filename().string() << " <template>config_options ]\n"
+      "[ compile-fail " << negative_file.filename().string() << " <template>config_options ] ;\n";
 
    jamfile_v2 << "test-suite \"" << macro_name << "\" : \n"
-      "[ run ../" << positive_file.leaf().string() << " ]\n"
-      "[ compile-fail ../" << negative_file.leaf().string() << " ] ;\n";
+      "[ run ../" << positive_file.filename().string() << " ]\n"
+      "[ compile-fail ../" << negative_file.filename().string() << " ] ;\n";
 
    // Generate data for the Build-checks test file:
    build_config_test << "#ifdef TEST_" << macro_name << std::endl;
@@ -597,7 +598,7 @@ int cpp_main(int argc, char* argv[])
    {
       // try __FILE__:
       fs::path p(__FILE__);
-      config_path = p.branch_path().branch_path() / "test";
+      config_path = p.parent_path().parent_path() / "test";
    }
    std::cout << "Info: Boost.Config test path set as: " << config_path.string() << std::endl;
 
@@ -608,7 +609,7 @@ int cpp_main(int argc, char* argv[])
    std::map<fs::path, bool> files_to_process;
    while(i != j)
    {
-      if(boost::regex_match(i->path().leaf().string(), ipp_match, ipp_mask))
+      if(boost::regex_match(i->path().filename().string(), ipp_match, ipp_mask))
       {
          files_to_process[*i] = ipp_match[1].matched;
       }