diff --git a/scripts/cxx-api/parser/builders.py b/scripts/cxx-api/parser/builders.py
index 9beb9a93880d..f72c62f45e2b 100644
--- a/scripts/cxx-api/parser/builders.py
+++ b/scripts/cxx-api/parser/builders.py
@@ -249,7 +249,7 @@ def get_variable_member(
         if initializer_type == InitializerType.BRACE:
             is_brace_initializer = True
 
-    return VariableMember(
+    member = VariableMember(
         variable_name,
         variable_type,
         visibility,
@@ -263,6 +263,10 @@ def get_variable_member(
         is_brace_initializer,
     )
 
+    member.add_template(get_template_params(member_def))
+
+    return member
+
 
 def get_doxygen_params(
     function_def: compound.MemberdefType,
@@ -313,6 +317,21 @@ def get_doxygen_params(
             else:
                 param_type += param_array
 
+        # Handle pointer-to-member-function types where the name must be
+        # embedded inside the declarator group.  Doxygen gives:
+        #   type = "void(ns::*)() const", name = "asFoo"
+        # We need to produce:
+        #   "void(ns::*asFoo)() const"
+        if param_name:
+            m = re.search(r"\([^)]*::\*\)", param_type)
+            if m:
+                # Insert name before the closing ')' of the ptr-to-member group
+                insert_pos = m.end() - 1
+                param_type = (
+                    param_type[:insert_pos] + param_name + param_type[insert_pos:]
+                )
+                param_name = None
+
         qualifiers, core_type = extract_qualifiers(param_type)
         arguments.append((qualifiers, core_type, param_name, param_default))
 
diff --git a/scripts/cxx-api/parser/member.py b/scripts/cxx-api/parser/member.py
index 7681b42dc1df..7c8290dad50e 100644
--- a/scripts/cxx-api/parser/member.py
+++ b/scripts/cxx-api/parser/member.py
@@ -162,6 +162,9 @@ def to_string(
 
         result = " " * indent
 
+        if self.template_list is not None:
+            result += self.template_list.to_string() + "\n" + " " * indent
+
         if not hide_visibility:
             result += self.visibility + " "
 
diff --git a/scripts/cxx-api/parser/scope.py b/scripts/cxx-api/parser/scope.py
index b4cc776cd055..615af32a1967 100644
--- a/scripts/cxx-api/parser/scope.py
+++ b/scripts/cxx-api/parser/scope.py
@@ -396,8 +396,13 @@ def qualify_name(self, name: str | None) -> str | None:
             elif any(
                 m.name == base_name and not isinstance(m, FriendMember)
                 for m in current_scope._members
+            ) or any(
+                any(m.name == base_name for m in inner._members)
+                for inner in current_scope.inner_scopes.values()
+                if isinstance(inner.kind, EnumScopeKind)
             ):
-                # Found as a member, assume following segments exist in the scope
+                # Found as a member (or as an unscoped enum value accessible
+                # from the parent scope), assume following segments exist
                 prefix = "::".join(matched_segments)
                 suffix = "::".join(path[i:])
                 anchor_prefix = anchor_scope.get_qualified_name()
diff --git a/scripts/cxx-api/tests/snapshots/should_handle_pointer_to_member_function_param/snapshot.api b/scripts/cxx-api/tests/snapshots/should_handle_pointer_to_member_function_param/snapshot.api
new file mode 100644
index 000000000000..3df3cf570cee
--- /dev/null
+++ b/scripts/cxx-api/tests/snapshots/should_handle_pointer_to_member_function_param/snapshot.api
@@ -0,0 +1,6 @@
+struct folly::dynamic {
+}
+
+
+template <typename R, typename... T>
+R test::jsArg(const folly::dynamic& arg, R(folly::dynamic::*asFoo)() const, const T &... desc);
diff --git a/scripts/cxx-api/tests/snapshots/should_handle_pointer_to_member_function_param/test.h b/scripts/cxx-api/tests/snapshots/should_handle_pointer_to_member_function_param/test.h
new file mode 100644
index 000000000000..8aaea82b5a17
--- /dev/null
+++ b/scripts/cxx-api/tests/snapshots/should_handle_pointer_to_member_function_param/test.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+namespace folly {
+
+struct dynamic {};
+
+} // namespace folly
+
+namespace test {
+
+template <typename R, typename... T>
+R jsArg(const folly::dynamic &arg, R (folly::dynamic::*asFoo)() const, const T &...desc);
+
+} // namespace test
diff --git a/scripts/cxx-api/tests/snapshots/should_handle_template_variable/snapshot.api b/scripts/cxx-api/tests/snapshots/should_handle_template_variable/snapshot.api
new file mode 100644
index 000000000000..52711af8da35
--- /dev/null
+++ b/scripts/cxx-api/tests/snapshots/should_handle_template_variable/snapshot.api
@@ -0,0 +1,7 @@
+template <typename T>
+const test::Strct<T> test::Strct<T>::VALUE;
+
+template <typename T>
+struct test::Strct {
+  public static const test::Strct<T> VALUE;
+}
diff --git a/scripts/cxx-api/tests/snapshots/should_handle_template_variable/test.h b/scripts/cxx-api/tests/snapshots/should_handle_template_variable/test.h
new file mode 100644
index 000000000000..c1caf34d39df
--- /dev/null
+++ b/scripts/cxx-api/tests/snapshots/should_handle_template_variable/test.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+namespace test {
+
+template <typename T>
+struct Strct {
+  static const Strct<T> VALUE;
+};
+
+template <typename T>
+const Strct<T> Strct<T>::VALUE = {};
+
+} // namespace test
diff --git a/scripts/cxx-api/tests/snapshots/should_qualify_enum_value_in_template_specialization/snapshot.api b/scripts/cxx-api/tests/snapshots/should_qualify_enum_value_in_template_specialization/snapshot.api
new file mode 100644
index 000000000000..690ad506546f
--- /dev/null
+++ b/scripts/cxx-api/tests/snapshots/should_qualify_enum_value_in_template_specialization/snapshot.api
@@ -0,0 +1,19 @@
+struct test::Event {
+}
+
+enum test::Event::Type {
+  NodeAllocation,
+  NodeDeallocation,
+}
+
+template <test::Event::Type E>
+struct test::Event::TypedData {
+}
+
+struct test::Event::TypedData<test::Event::NodeAllocation> {
+  public int config;
+}
+
+struct test::Event::TypedData<test::Event::NodeDeallocation> {
+  public int config;
+}
diff --git a/scripts/cxx-api/tests/snapshots/should_qualify_enum_value_in_template_specialization/test.h b/scripts/cxx-api/tests/snapshots/should_qualify_enum_value_in_template_specialization/test.h
new file mode 100644
index 000000000000..b1c42974c792
--- /dev/null
+++ b/scripts/cxx-api/tests/snapshots/should_qualify_enum_value_in_template_specialization/test.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+namespace test {
+
+struct Event {
+  enum Type {
+    NodeAllocation,
+    NodeDeallocation,
+  };
+
+  template <Type E>
+  struct TypedData {};
+};
+
+template <>
+struct Event::TypedData<Event::NodeAllocation> {
+  int config;
+};
+
+template <>
+struct Event::TypedData<Event::NodeDeallocation> {
+  int config;
+};
+
+} // namespace test
diff --git a/scripts/cxx-api/tests/snapshots/should_qualify_variable_template_specialization/snapshot.api b/scripts/cxx-api/tests/snapshots/should_qualify_variable_template_specialization/snapshot.api
index 2d598603d29e..6248acdb5c77 100644
--- a/scripts/cxx-api/tests/snapshots/should_qualify_variable_template_specialization/snapshot.api
+++ b/scripts/cxx-api/tests/snapshots/should_qualify_variable_template_specialization/snapshot.api
@@ -1,5 +1,7 @@
-constexpr T test::default_value;
 constexpr test::MyType test::default_value<test::MyType>;
+template <typename T>
+constexpr T test::default_value;
+template <typename T>
 T* test::null_ptr;
 test::MyType* test::null_ptr<test::MyType>;