diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index bf3521eef3..a3cb96288d 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -30,7 +30,7 @@ jobs:
         dry-run: false
         language: jvm
     - name: Upload Crash
-      uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+      uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 5de5e794b3..a9ba918728 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -23,16 +23,16 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+      uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
       with:
         languages: ${{ matrix.language }}
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+      uses: github/codeql-action/autobuild@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+      uses: github/codeql-action/analyze@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
diff --git a/.github/workflows/dep_build_v2.yml b/.github/workflows/dep_build_v2.yml
index d1fca385d5..681cfa5046 100644
--- a/.github/workflows/dep_build_v2.yml
+++ b/.github/workflows/dep_build_v2.yml
@@ -20,9 +20,9 @@ jobs:
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - name: Set up JDK
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}
diff --git a/.github/workflows/dep_build_v3.yml b/.github/workflows/dep_build_v3.yml
index 08faa1cd2b..5791dd8c19 100644
--- a/.github/workflows/dep_build_v3.yml
+++ b/.github/workflows/dep_build_v3.yml
@@ -20,11 +20,11 @@ jobs:
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       with:
         ref: master
     - name: Set up JDK
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8fe5619ccc..cbb079b965 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ on:
     branches:
     - master
     - "3.0"
-    - "2.18"
+    - "2.19"
     paths-ignore:
     - "README.md"
     - "release-notes/*"
@@ -12,7 +12,7 @@ on:
     branches:
     - master
     - "3.0"
-    - "2.18"
+    - "2.19"
     paths-ignore:
     - "README.md"
     - "release-notes/*"
@@ -37,9 +37,9 @@ jobs:
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - name: Set up JDK
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}
diff --git a/README.md b/README.md
index 4fe7c30b0a..8f1025edda 100644
--- a/README.md
+++ b/README.md
@@ -240,7 +240,7 @@ ObjectMapper mapper = ...;
 File jsonFile = new File("test.json");
 // note: method added in Jackson 2.11 (earlier would need to use
 // mapper.getFactory().createGenerator(...)
-JsonGenerator g = f.createGenerator(jsonFile, JsonEncoding.UTF8);
+JsonGenerator g = mapper.createGenerator(jsonFile, JsonEncoding.UTF8);
 // write JSON: { "message" : "Hello world!" }
 g.writeStartObject();
 g.writeStringField("message", "Hello world!");
diff --git a/pom.xml b/pom.xml
index dc0c81b7f2..1fa7778585 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,11 +9,11 @@
   <parent>
     <groupId>com.fasterxml.jackson</groupId>
     <artifactId>jackson-base</artifactId>
-    <version>2.18.0-SNAPSHOT</version>
+    <version>2.19.0-SNAPSHOT</version>
   </parent>
   <groupId>com.fasterxml.jackson.core</groupId>
   <artifactId>jackson-databind</artifactId>
-  <version>2.18.0-SNAPSHOT</version>
+  <version>2.19.0-SNAPSHOT</version>
   <name>jackson-databind</name>
   <packaging>jar</packaging>
   <description>General data-binding functionality for Jackson: works on core streaming API</description>
@@ -68,7 +68,7 @@
     <packageVersion.package>com.fasterxml.jackson.databind.cfg</packageVersion.package>
 
     <!-- for Reproducible Builds -->
-    <project.build.outputTimestamp>2024-08-30T18:18:56Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-09-27T01:57:15Z</project.build.outputTimestamp>
   </properties>
 
   <dependencyManagement>
@@ -212,7 +212,6 @@
           </classpathDependencyExcludes>
           <excludes>
             <exclude>com.fasterxml.jackson.databind.MapperFootprintTest</exclude>
-            <exclude>**/failing/**/*.java</exclude>
           </excludes>
           <!-- 26-Nov-2019, tatu: moar parallelism! Per-class basis, safe, efficient enough
                   ... although not 100% sure this makes much difference TBH
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
index edd89ca848..c4acc306b4 100644
--- a/release-notes/CREDITS-2.x
+++ b/release-notes/CREDITS-2.x
@@ -849,6 +849,8 @@ Carter Kozak (carterkozak@github)
   * Contributed #3876: `TypeFactory` cache performance degradation with
     `constructSpecializedType()`
    (2.15.0)
+  * Contributed #4688: Should allow deserializing with no-arg `@JsonCreator(mode = DELEGATING)`
+   (2.18.0)
 
 Reinhard Prechtl (dnno@github)
   * Reported #2034: Serialization problem with type specialization of nested generic types
@@ -1668,6 +1670,9 @@ Antti Lampinen (arlampin@github)
   * Reported #3897: 2.15.0 breaks deserialization when POJO/Record only has a single field
     and is marked `Access.WRITE_ONLY`
    (2.15.1)
+  * Reported #4724: Deserialization behavior change with Records, `@JsonCreator` and
+   `@JsonValue` between 2.17 and 2.18
+   (2.18.1)
 
 Dmitry Bolotin (dbolotin@github)
   * Reported #1172: `@JsonView` doesn't work with `@JsonCreator`
@@ -1827,3 +1832,28 @@ Eduard Gomoliako (Gems@github)
 Mathijs Vogelzang (mathijs81@github)
  * Reported #4678: Java records don't serialize with `MapperFeature.REQUIRE_SETTERS_FOR_GETTERS`
   (2.18.0)
+
+Rikkarth (rikkarth@github)
+ * Contributed #4709: Add `JacksonCollectors` with `toArrayNode()` implementation
+  (2.18.0)
+
+Maxim Valeev (@MaximValeev)
+ * Reported #4508: Deserialized JsonAnySetter field in Kotlin data class is null
+  (2.18.1)
+
+wrongwrong (@k163377)
+ * Contributed #4749: Fixed problem in StdDelegatingSerializer#serializeWithType where final serializer lookup was done
+   on the pre-converted value when _delegateSerializer was null
+  (2.18.1)
+
+@SandeepGaur2016
+ * Contributed fix for #2461: Nested `@JsonUnwrapped` property names not correctly handled
+  (2.19.0)
+
+Konstantin Maliuga (@badoken)
+ * Contributed #4674: Allow setting global enum naming strategy similar to property naming strategy
+  (2.19.0)
+
+Lars Benedetto (@lbenedetto)
+ * Contributed #4676: Support other enum naming strategies than camelCase
+  (2.19.0)
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
index 70fa70f88a..b87cb4417d 100644
--- a/release-notes/VERSION-2.x
+++ b/release-notes/VERSION-2.x
@@ -4,7 +4,40 @@ Project: jackson-databind
 === Releases === 
 ------------------------------------------------------------------------
 
-2.18.0 (not yet released)
+2.19.0 (not yet released)
+
+#2461: Nested `@JsonUnwrapped` property names not correctly handled
+ (reported by @plovell)
+ (fix contributed by @SandeepGaur2016)
+#4674: Allow setting global enum naming strategy similar to property naming strategy
+ (requested by @hajdamak)
+ (contributed by Konstantin M)
+#4676: Support other enum naming strategies than camelCase
+ (requested by @hajdamak)
+ (contributed by Lars 
+
+2.18.1 (WIP-2024)
+
+#4741: When `Include.NON_DEFAULT` setting is used on POJO, empty values
+  are not included in json if default is `null`
+ (reported by @ragnhov)
+ (fix by Joo-Hyuk K)
+#4749: Fixed a problem with `StdDelegatingSerializer#serializeWithType` looking up the serializer
+  with the wrong argument
+ (fix by wrongwrong)
+#4508: Deserialized JsonAnySetter field in Kotlin data class is null
+ (reported by @MaximValeev)
+ (fix by Joo-Hyuk K)
+#4639: @JsonAnySetter on field ignoring unrecognized properties if they are
+  declared before the last recognized properties in JSON
+ (reported by Sim Y-T)
+ (fix by Joo-Hyuk K)
+#4718: Should not fail on trying to serialize `java.time.DateTimeException`
+#4724: Deserialization behavior change with Records, `@JsonCreator` and
+  `@JsonValue` between 2.17 and 2.18
+ (reported by Antti L)
+
+2.18.0 (26-Sep-2024)
 
 #562: Allow `@JsonAnySetter` to flow through Creators
  (reported by Benson M)
@@ -13,6 +46,9 @@ Project: jackson-databind
 #2977: Incompatible `FAIL_ON_MISSING_PRIMITIVE_PROPERTIES` and
   field level `@JsonProperty`
  (reported by @GeorgiPetkov)
+#3120: Return `ListIterator` from `ArrayNode.elements()`
+ (requested by @ludgerb)
+ (fix by Joo-Hyuk K)
 #3241: `constructorDetector` seems to invalidate `defaultSetterInfo`
   for nullability
  (reported by @joca-bt)
@@ -70,6 +106,18 @@ Project: jackson-databind
  (contributed by Sim Y-T)
 #4678: Java records don't serialize with `MapperFeature.REQUIRE_SETTERS_FOR_GETTERS`
  (reported by Mathijs V)
+#4688: Should allow deserializing with no-arg `@JsonCreator(mode = DELEGATING)`
+ (contributed by Carter K)
+#4694: Deserializing `BigDecimal` with large number of decimals result in incorrect value
+ (reported by @lnthai2002)
+#4699: Add extra `writeNumber()` method in `TokenBuffer`
+ (contributed by @pjfanning)
+#4709: Add `JacksonCollectors` with `toArrayNode()` implementation
+ (contributed by @rikkarth)
+
+2.17.3 (not yet released)
+
+#4718: Should not fail on trying to serialize `java.time.DateTimeException`
 
 2.17.2 (05-Jul-2024)
 
diff --git a/src/main/java/com/fasterxml/jackson/databind/EnumNamingStrategies.java b/src/main/java/com/fasterxml/jackson/databind/EnumNamingStrategies.java
index 4115f544dc..5a133a8d00 100644
--- a/src/main/java/com/fasterxml/jackson/databind/EnumNamingStrategies.java
+++ b/src/main/java/com/fasterxml/jackson/databind/EnumNamingStrategies.java
@@ -1,5 +1,9 @@
 package com.fasterxml.jackson.databind;
 
+import com.fasterxml.jackson.databind.util.NamingStrategyImpls;
+
+import java.util.Locale;
+
 /**
  * A container class for implementations of the {@link EnumNamingStrategy} interface.
  *
@@ -10,55 +14,96 @@ public class EnumNamingStrategies
     private EnumNamingStrategies() {}
 
     /**
+     * Words other than first are capitalized and no separator is used between words.
+     * See {@link EnumNamingStrategies.LowerCamelCaseStrategy} for details.
      * <p>
-     * An implementation of {@link EnumNamingStrategy} that converts enum names in the typical upper
-     * snake case format to camel case format. This implementation follows three rules
-     * described below.
+     * Example "ENUM_NAME" would be converted to "enumName".
      *
-     * <ol>
-     * <li>converts any character preceded by an underscore into upper case character,
-     * regardless of its original case (upper or lower).</li>
-     * <li>converts any character NOT preceded by an underscore into a lower case character,
-     * regardless of its original case (upper or lower).</li>
-     * <li>converts contiguous sequence of underscores into a single underscore.</li>
-     * </ol>
+     * @since 2.19
+     */
+    public static final EnumNamingStrategy LOWER_CAMEL_CASE = LowerCamelCaseStrategy.INSTANCE;
+
+    /**
+     * Naming convention used in languages like Pascal, where all words are capitalized and no separator is used between
+     * words.
+     * See {@link EnumNamingStrategies.UpperCamelCaseStrategy} for details.
+     * <p>
+     * Example "ENUM_NAME" would be converted to "EnumName".
      *
-     * WARNING: Naming conversion conflicts caused by underscore usage should be handled by client.
-     * e.g. Both <code>PEANUT_BUTTER</code>, <code>PEANUT__BUTTER</code> are converted into "peanutButter".
-     * And "peanutButter" will be deserialized into enum with smaller <code>Enum.ordinal()</code> value.
+     * @since 2.19
+     */
+    public static final EnumNamingStrategy UPPER_CAMEL_CASE = UpperCamelCaseStrategy.INSTANCE;
+
+    /**
+     * Naming convention used in languages like C, where words are in lower-case letters, separated by underscores.
+     * See {@link EnumNamingStrategies.SnakeCaseStrategy} for details.
+     * <p>
+     * Example "ENUM_NAME" would be converted to "enum_name".
      *
+     * @since 2.19
+     */
+    public static final EnumNamingStrategy SNAKE_CASE = SnakeCaseStrategy.INSTANCE;
+
+    /**
+     * Naming convention in which the words are in upper-case letters, separated by underscores.
+     * See {@link EnumNamingStrategies.UpperSnakeCaseStrategy} for details.
      * <p>
-     * These rules result in the following example conversions from upper snakecase names
-     * to camelcase names.
-     * <ul>
-     * <li>"USER_NAME" is converted into "userName"</li>
-     * <li>"USER______NAME" is converted into "userName"</li>
-     * <li>"USERNAME" is converted into "username"</li>
-     * <li>"User__Name" is converted into "userName"</li>
-     * <li>"_user_name" is converted into "UserName"</li>
-     * <li>"_user_name_s" is converted into "UserNameS"</li>
-     * <li>"__Username" is converted into "Username"</li>
-     * <li>"__username" is converted into "Username"</li>
-     * <li>"username" is converted into "username"</li>
-     * <li>"Username" is converted into "username"</li>
-     * </ul>
+     * Example "ENUM_NAME" would be converted to "ENUM_NAME", but "__ENUM_NAME_" would also be converted to "ENUM_NAME".
      *
-     * @since 2.15
+     * @since 2.19
      */
-    public static class CamelCaseStrategy implements EnumNamingStrategy
-    {
-        /**
-         * An instance of {@link CamelCaseStrategy} for reuse.
-         *
-         * @since 2.15
-         */
-        public static final CamelCaseStrategy INSTANCE = new CamelCaseStrategy();
+    public static final EnumNamingStrategy UPPER_SNAKE_CASE = UpperSnakeCaseStrategy.INSTANCE;
+
+    /**
+     * Naming convention in which all words of the logical name are in lower case, and no separator is used between words.
+     * See {@link EnumNamingStrategies.LowerCaseStrategy} for details.
+     * <p>
+     * Example "ENUM_NAME" would be converted to "enumname".
+     *
+     * @since 2.19
+     */
+    public static final EnumNamingStrategy LOWER_CASE = LowerCaseStrategy.INSTANCE;
+
+    /**
+     * Naming convention used in languages like Lisp, where words are in lower-case letters, separated by hyphens.
+     * See {@link EnumNamingStrategies.KebabCaseStrategy} for details.
+     * <p>
+     * Example "ENUM_NAME" would be converted to "enum-name".
+     *
+     * @since 2.19
+     */
+    public static final EnumNamingStrategy KEBAB_CASE = KebabCaseStrategy.INSTANCE;
+
+    /**
+     * Naming convention widely used as configuration properties name, where words are in lower-case letters,
+     * separated by dots.
+     * See {@link EnumNamingStrategies.LowerDotCaseStrategy} for details.
+     * <p>
+     * Example "ENUM_NAME" would be converted to "enum.name".
+     *
+     * @since 2.19
+     */
+    public static final EnumNamingStrategy LOWER_DOT_CASE = LowerDotCaseStrategy.INSTANCE;
+
+    public abstract static class DelegatingEnumNamingStrategy implements EnumNamingStrategy {
+        private final NamingStrategyImpls strategy;
+
+        protected DelegatingEnumNamingStrategy(NamingStrategyImpls strategy) {
+            this.strategy = strategy;
+        }
 
-        /**
-         * @since 2.15
-         */
         @Override
         public String convertEnumToExternalName(String enumName) {
+            return strategy.translate(toBeanName(enumName));
+        }
+
+        /**
+         * Normalizes the enum name to lower camel case in order to be further processed by a NamingStrategies
+         *
+         * @param enumName the enum name to be normalized
+         * @return the normalized enum name
+         */
+        protected static String toBeanName(String enumName) {
             if (enumName == null) {
                 return null;
             }
@@ -69,11 +114,11 @@ public String convertEnumToExternalName(String enumName) {
             int lastSeparatorIdx = -1;
 
             do {
-                lastSeparatorIdx = indexIn(enumName, lastSeparatorIdx + 1);
+                lastSeparatorIdx = nextIndexOfUnderscore(enumName, lastSeparatorIdx + 1);
                 if (lastSeparatorIdx != -1) {
                     if (iterationCnt == 0) {
                         out = new StringBuilder(enumName.length() + 4 * UNDERSCORE.length());
-                        out.append(toLowerCase(enumName.substring(iterationCnt, lastSeparatorIdx)));
+                        out.append(enumName.substring(iterationCnt, lastSeparatorIdx).toLowerCase(Locale.ROOT));
                     } else {
                         out.append(normalizeWord(enumName.substring(iterationCnt, lastSeparatorIdx)));
                     }
@@ -82,13 +127,13 @@ public String convertEnumToExternalName(String enumName) {
             } while (lastSeparatorIdx != -1);
 
             if (iterationCnt == 0) {
-                return toLowerCase(enumName);
+                return enumName.toLowerCase(Locale.ROOT);
             }
             out.append(normalizeWord(enumName.substring(iterationCnt)));
             return out.toString();
         }
 
-        private static int indexIn(CharSequence sequence, int start) {
+        private static int nextIndexOfUnderscore(CharSequence sequence, int start) {
             int length = sequence.length();
             for (int i = start; i < length; i++) {
                 if ('_' == sequence.charAt(i)) {
@@ -98,32 +143,334 @@ private static int indexIn(CharSequence sequence, int start) {
             return -1;
         }
 
+        /**
+         * Converts the first letter of the word to uppercase and the rest of the word to lowercase.
+         */
         private static String normalizeWord(String word) {
             int length = word.length();
             if (length == 0) {
                 return word;
             }
-            return new StringBuilder(length)
-                    .append(charToUpperCaseIfLower(word.charAt(0)))
-                    .append(toLowerCase(word.substring(1)))
-                    .toString();
+            return Character.toUpperCase(word.charAt(0)) + word.substring(1).toLowerCase();
         }
+    }
 
-        private static String toLowerCase(String string) {
-            int length = string.length();
-            StringBuilder builder = new StringBuilder(length);
-            for (int i = 0; i < length; i++) {
-                builder.append(charToLowerCaseIfUpper(string.charAt(i)));
-            }
-            return builder.toString();
+    /**
+     * @since 2.15
+     * @deprecated Since 2.19 use {@link LowerCamelCaseStrategy} instead.
+     */
+    @Deprecated
+    public static class CamelCaseStrategy extends DelegatingEnumNamingStrategy {
+        /**
+         * An instance of {@link CamelCaseStrategy} for reuse.
+         *
+         * @since 2.15
+         */
+        public static final CamelCaseStrategy INSTANCE = new CamelCaseStrategy();
+
+        protected CamelCaseStrategy() {
+            super(NamingStrategyImpls.LOWER_CAMEL_CASE);
+        }
+    }
+
+    /**
+     * <p>
+     * An implementation of {@link EnumNamingStrategy} that converts enum names in the typical upper
+     * snake case format to lower camel case format. This implementation follows three rules
+     * described below.
+     *
+     * <ol>
+     * <li>converts any character preceded by an underscore into upper case character,
+     * regardless of its original case (upper or lower).</li>
+     * <li>converts any character NOT preceded by an underscore into a lower case character,
+     * regardless of its original case (upper or lower).</li>
+     * <li>removes all underscores.</li>
+     * </ol>
+     * <p>
+     * WARNING: Naming conversion conflicts caused by underscore usage should be handled by client.
+     * e.g. Both <code>PEANUT_BUTTER</code>, <code>PEANUT__BUTTER</code> are converted into "peanutButter".
+     * And "peanutButter" will be deserialized into enum with smaller <code>Enum.ordinal()</code> value.
+     *
+     * <p>
+     * This results in the following example conversions:
+     * <ul>
+     * <li>"USER_NAME" is converted into "userName"</li>
+     * <li>"USER______NAME" is converted into "userName"</li>
+     * <li>"USERNAME" is converted into "username"</li>
+     * <li>"User__Name" is converted into "userName"</li>
+     * <li>"_user_name" is converted into "UserName"</li>
+     * <li>"_user_name_s" is converted into "UserNameS"</li>
+     * <li>"__Username" is converted into "Username"</li>
+     * <li>"__username" is converted into "Username"</li>
+     * <li>"username" is converted into "username"</li>
+     * <li>"Username" is converted into "username"</li>
+     * </ul>
+     *
+     * @since 2.19
+     */
+    public static class LowerCamelCaseStrategy extends DelegatingEnumNamingStrategy {
+
+        /**
+         * An instance of {@link LowerCamelCaseStrategy} for reuse.
+         *
+         * @since 2.19
+         */
+        public static final LowerCamelCaseStrategy INSTANCE = new LowerCamelCaseStrategy();
+
+        protected LowerCamelCaseStrategy() {
+            super(NamingStrategyImpls.LOWER_CAMEL_CASE);
+        }
+    }
+
+    /**
+     * <p>
+     * An implementation of {@link EnumNamingStrategy} that converts enum names in the typical upper
+     * snake case format to upper camel case format.
+     * This implementation first normalizes to lower camel case using (see {@link LowerCamelCaseStrategy} for details)
+     * and then uses {@link PropertyNamingStrategies.UpperCamelCaseStrategy} to finish converting the name.
+     * <p>
+     * WARNING: Naming conversion conflicts caused by underscore usage should be handled by client.
+     * e.g. Both <code>PEANUT_BUTTER</code>, <code>PEANUT__BUTTER</code> are converted into "PeanutButter".
+     * And "PeanutButter" will be deserialized into enum with smaller <code>Enum.ordinal()</code> value.
+     *
+     * <p>
+     * This results in the following example conversions:
+     * <ul>
+     * <li>"USER_NAME" is converted into "UserName"</li>
+     * <li>"USER______NAME" is converted into "UserName"</li>
+     * <li>"USERNAME" is converted into "Username"</li>
+     * <li>"User__Name" is converted into "UserName"</li>
+     * <li>"_user_name" is converted into "UserName"</li>
+     * <li>"_user_name_s" is converted into "UserNameS"</li>
+     * <li>"__Username" is converted into "Username"</li>
+     * <li>"__username" is converted into "Username"</li>
+     * <li>"username" is converted into "Username"</li>
+     * <li>"Username" is converted into "Username"</li>
+     * </ul>
+     *
+     * @since 2.19
+     */
+    public static class UpperCamelCaseStrategy extends DelegatingEnumNamingStrategy {
+
+        /**
+         * An instance of {@link LowerCamelCaseStrategy} for reuse.
+         *
+         * @since 2.19
+         */
+        public static final UpperCamelCaseStrategy INSTANCE = new UpperCamelCaseStrategy();
+
+        protected UpperCamelCaseStrategy() {
+            super(NamingStrategyImpls.UPPER_CAMEL_CASE);
+        }
+    }
+
+    /**
+     * <p>
+     * An implementation of {@link EnumNamingStrategy} that converts enum names in the typical upper
+     * snake case format to upper camel case format.
+     * This implementation first normalizes to lower camel case using (see {@link LowerCamelCaseStrategy} for details)
+     * and then uses {@link PropertyNamingStrategies.SnakeCaseStrategy} to finish converting the name.
+     * <p>
+     * WARNING: Naming conversion conflicts caused by underscore usage should be handled by client.
+     * e.g. Both <code>PEANUT_BUTTER</code>, <code>PEANUT__BUTTER</code> are converted into "peanut_butter".
+     * And "peanut_butter" will be deserialized into enum with smaller <code>Enum.ordinal()</code> value.
+     *
+     * <p>
+     * This results in the following example conversions:
+     * <ul>
+     * <li>"USER_NAME" is converted into "user_name"</li>
+     * <li>"USER______NAME" is converted into "user_name"</li>
+     * <li>"USERNAME" is converted into "username"</li>
+     * <li>"User__Name" is converted into "user_name"</li>
+     * <li>"_user_name" is converted into "user_name"</li>
+     * <li>"_user_name_s" is converted into "user_name_s"</li>
+     * <li>"__Username" is converted into "username"</li>
+     * <li>"__username" is converted into "username"</li>
+     * <li>"username" is converted into "username"</li>
+     * <li>"Username" is converted into "username"</li>
+     * </ul>
+     *
+     * @since 2.19
+     */
+    public static class SnakeCaseStrategy extends DelegatingEnumNamingStrategy {
+
+        /**
+         * An instance of {@link SnakeCaseStrategy} for reuse.
+         *
+         * @since 2.19
+         */
+        public static final SnakeCaseStrategy INSTANCE = new SnakeCaseStrategy();
+
+        protected SnakeCaseStrategy() {
+            super(NamingStrategyImpls.SNAKE_CASE);
+        }
+    }
+
+    /**
+     * <p>
+     * An implementation of {@link EnumNamingStrategy} that converts enum names in the typical upper
+     * snake case format to upper camel case format.
+     * This implementation first normalizes to lower camel case using (see {@link LowerCamelCaseStrategy} for details)
+     * and then uses {@link PropertyNamingStrategies.UpperSnakeCaseStrategy} to finish converting the name.
+     * <p>
+     * WARNING: Naming conversion conflicts caused by underscore usage should be handled by client.
+     * e.g. Both <code>PEANUT_BUTTER</code>, <code>PEANUT__BUTTER</code> are converted into "PEANUT_BUTTER".
+     * And "PEANUT_BUTTER" will be deserialized into enum with smaller <code>Enum.ordinal()</code> value.
+     *
+     * <p>
+     * This results in the following example conversions:
+     * <ul>
+     * <li>"USER_NAME" is converted into "USER_NAME"</li>
+     * <li>"USER______NAME" is converted into "USER_NAME"</li>
+     * <li>"USERNAME" is converted into "USERNAME"</li>
+     * <li>"User__Name" is converted into "USER_NAME"</li>
+     * <li>"_user_name" is converted into "USER_NAME"</li>
+     * <li>"_user_name_s" is converted into "USER_NAME_S"</li>
+     * <li>"__Username" is converted into "USERNAME"</li>
+     * <li>"__username" is converted into "USERNAME"</li>
+     * <li>"username" is converted into "USERNAME"</li>
+     * <li>"Username" is converted into "USERNAME"</li>
+     * </ul>
+     *
+     * @since 2.19
+     */
+    public static class UpperSnakeCaseStrategy extends DelegatingEnumNamingStrategy {
+
+        /**
+         * An instance of {@link UpperSnakeCaseStrategy} for reuse.
+         *
+         * @since 2.19
+         */
+        public static final UpperSnakeCaseStrategy INSTANCE = new UpperSnakeCaseStrategy();
+
+        protected UpperSnakeCaseStrategy() {
+            super(NamingStrategyImpls.UPPER_SNAKE_CASE);
         }
+    }
+
+    /**
+     * <p>
+     * An implementation of {@link EnumNamingStrategy} that converts enum names in the typical upper
+     * snake case format to upper camel case format.
+     * This implementation first normalizes to lower camel case using (see {@link LowerCamelCaseStrategy} for details)
+     * and then uses {@link PropertyNamingStrategies.LowerCaseStrategy} to finish converting the name.
+     * <p>
+     * WARNING: Naming conversion conflicts caused by underscore usage should be handled by client.
+     * e.g. Both <code>PEANUT_BUTTER</code>, <code>PEANUT__BUTTER</code> are converted into "peanutbutter".
+     * And "peanutbutter" will be deserialized into enum with smaller <code>Enum.ordinal()</code> value.
+     *
+     * <p>
+     * This results in the following example conversions:
+     * <ul>
+     * <li>"USER_NAME" is converted into "username"</li>
+     * <li>"USER______NAME" is converted into "username"</li>
+     * <li>"USERNAME" is converted into "username"</li>
+     * <li>"User__Name" is converted into "username"</li>
+     * <li>"_user_name" is converted into "username"</li>
+     * <li>"_user_name_s" is converted into "usernames"</li>
+     * <li>"__Username" is converted into "username"</li>
+     * <li>"__username" is converted into "username"</li>
+     * <li>"username" is converted into "username"</li>
+     * <li>"Username" is converted into "username"</li>
+     * </ul>
+     *
+     * @since 2.19
+     */
+    public static class LowerCaseStrategy extends DelegatingEnumNamingStrategy {
+
+        /**
+         * An instance of {@link LowerCaseStrategy} for reuse.
+         *
+         * @since 2.19
+         */
+        public static final LowerCaseStrategy INSTANCE = new LowerCaseStrategy();
+
+        protected LowerCaseStrategy() {
+            super(NamingStrategyImpls.LOWER_CASE);
+        }
+    }
+
+    /**
+     * <p>
+     * An implementation of {@link EnumNamingStrategy} that converts enum names in the typical upper
+     * snake case format to upper camel case format.
+     * This implementation first normalizes to lower camel case using (see {@link LowerCamelCaseStrategy} for details)
+     * and then uses {@link PropertyNamingStrategies.KebabCaseStrategy} to finish converting the name.
+     * <p>
+     * WARNING: Naming conversion conflicts caused by underscore usage should be handled by client.
+     * e.g. Both <code>PEANUT_BUTTER</code>, <code>PEANUT__BUTTER</code> are converted into "peanut-butter".
+     * And "peanut-butter" will be deserialized into enum with smaller <code>Enum.ordinal()</code> value.
+     *
+     * <p>
+     * This results in the following example conversions:
+     * <ul>
+     * <li>"USER_NAME" is converted into "user-name"</li>
+     * <li>"USER______NAME" is converted into "user-name"</li>
+     * <li>"USERNAME" is converted into "username"</li>
+     * <li>"User__Name" is converted into "user-name"</li>
+     * <li>"_user_name" is converted into "user-name"</li>
+     * <li>"_user_name_s" is converted into "user-name-s"</li>
+     * <li>"__Username" is converted into "username"</li>
+     * <li>"__username" is converted into "username"</li>
+     * <li>"username" is converted into "username"</li>
+     * <li>"Username" is converted into "username"</li>
+     * </ul>
+     *
+     * @since 2.19
+     */
+    public static class KebabCaseStrategy extends DelegatingEnumNamingStrategy {
+
+        /**
+         * An instance of {@link KebabCaseStrategy} for reuse.
+         *
+         * @since 2.19
+         */
+        public static final KebabCaseStrategy INSTANCE = new KebabCaseStrategy();
 
-        private static char charToUpperCaseIfLower(char c) {
-            return Character.isLowerCase(c) ? Character.toUpperCase(c) : c;
+        protected KebabCaseStrategy() {
+            super(NamingStrategyImpls.KEBAB_CASE);
         }
+    }
+
+    /**
+     * <p>
+     * An implementation of {@link EnumNamingStrategy} that converts enum names in the typical upper
+     * snake case format to lower dot case format.
+     * This implementation first normalizes to lower camel case using (see {@link LowerCamelCaseStrategy} for details)
+     * and then uses {@link PropertyNamingStrategies.LowerDotCaseStrategy} to finish converting the name.
+     * <p>
+     * WARNING: Naming conversion conflicts caused by underscore usage should be handled by client.
+     * e.g. Both <code>PEANUT_BUTTER</code>, <code>PEANUT__BUTTER</code> are converted into "peanut.butter".
+     * And "peanut.butter" will be deserialized into enum with smaller <code>Enum.ordinal()</code> value.
+     *
+     * <p>
+     * This results in the following example conversions:
+     * <ul>
+     * <li>"USER_NAME" is converted into "user.name"</li>
+     * <li>"USER______NAME" is converted into "user.name"</li>
+     * <li>"USERNAME" is converted into "username"</li>
+     * <li>"User__Name" is converted into "user.name"</li>
+     * <li>"_user_name" is converted into "user.name"</li>
+     * <li>"_user_name_s" is converted into "user.name.s"</li>
+     * <li>"__Username" is converted into "username"</li>
+     * <li>"__username" is converted into "username"</li>
+     * <li>"username" is converted into "username"</li>
+     * <li>"Username" is converted into "username"</li>
+     * </ul>
+     *
+     * @since 2.19
+     */
+    public static class LowerDotCaseStrategy extends DelegatingEnumNamingStrategy {
+
+        /**
+         * An instance of {@link LowerDotCaseStrategy} for reuse.
+         *
+         * @since 2.19
+         */
+        public static final LowerDotCaseStrategy INSTANCE = new LowerDotCaseStrategy();
 
-        private static char charToLowerCaseIfUpper(char c) {
-            return Character.isUpperCase(c) ? Character.toLowerCase(c) : c;
+        protected LowerDotCaseStrategy() {
+            super(NamingStrategyImpls.LOWER_DOT_CASE);
         }
     }
 }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java b/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java
index c06999da2a..9a32b005a6 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java
@@ -408,7 +408,7 @@ public boolean useForType(JavaType t)
     protected final static BaseSettings DEFAULT_BASE = new BaseSettings(
             null, // cannot share global ClassIntrospector any more (2.5+)
             DEFAULT_ANNOTATION_INTROSPECTOR,
-             null, TypeFactory.defaultInstance(),
+            null, null, TypeFactory.defaultInstance(),
             null, StdDateFormat.instance, null,
             Locale.getDefault(),
             null, // to indicate "use Jackson default TimeZone" (UTC since Jackson 2.7)
@@ -1750,6 +1750,24 @@ public PropertyNamingStrategy getPropertyNamingStrategy() {
         return _serializationConfig.getPropertyNamingStrategy();
     }
 
+    /**
+     * Method for setting custom enum naming strategy to use.
+     *
+     * @since 2.19
+     */
+    public ObjectMapper setEnumNamingStrategy(EnumNamingStrategy s) {
+        _serializationConfig = _serializationConfig.with(s);
+        _deserializationConfig = _deserializationConfig.with(s);
+        return this;
+    }
+
+    /**
+     * @since 2.19
+     */
+    public EnumNamingStrategy getEnumNamingStrategy() {
+        return _serializationConfig.getEnumNamingStrategy();
+    }
+
     /**
      * Method for setting custom accessor naming strategy to use.
      *
diff --git a/src/main/java/com/fasterxml/jackson/databind/PropertyNamingStrategies.java b/src/main/java/com/fasterxml/jackson/databind/PropertyNamingStrategies.java
index c0b7664dba..6060e92377 100644
--- a/src/main/java/com/fasterxml/jackson/databind/PropertyNamingStrategies.java
+++ b/src/main/java/com/fasterxml/jackson/databind/PropertyNamingStrategies.java
@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
 import com.fasterxml.jackson.databind.introspect.AnnotatedParameter;
+import com.fasterxml.jackson.databind.util.NamingStrategyImpls;
 
 /**
  * Container for standard {@link PropertyNamingStrategy} implementations
@@ -124,42 +125,6 @@ public String nameForConstructorParameter(MapperConfig<?> config, AnnotatedParam
         }
 
         public abstract String translate(String propertyName);
-
-        /**
-         * Helper method to share implementation between snake and dotted case.
-         */
-        protected String translateLowerCaseWithSeparator(final String input, final char separator)
-        {
-            if (input == null || input.isEmpty()) {
-                return input;
-            }
-
-            final int length = input.length();
-            final StringBuilder result = new StringBuilder(length + (length >> 1));
-            int upperCount = 0;
-            for (int i = 0; i < length; ++i) {
-                char ch = input.charAt(i);
-                char lc = Character.toLowerCase(ch);
-
-                if (lc == ch) { // lower-case letter means we can get new word
-                    // but need to check for multi-letter upper-case (acronym), where assumption
-                    // is that the last upper-case char is start of a new word
-                    if (upperCount > 1) {
-                        // so insert hyphen before the last character now
-                        result.insert(result.length() - 1, separator);
-                    }
-                    upperCount = 0;
-                } else {
-                    // Otherwise starts new word, unless beginning of string
-                    if ((upperCount == 0) && (i > 0)) {
-                        result.append(separator);
-                    }
-                    ++upperCount;
-                }
-                result.append(lc);
-            }
-            return result.toString();
-        }
     }
 
     /*
@@ -230,35 +195,7 @@ public static class SnakeCaseStrategy extends NamingBase
         @Override
         public String translate(String input)
         {
-            if (input == null) return input; // garbage in, garbage out
-            int length = input.length();
-            StringBuilder result = new StringBuilder(length * 2);
-            int resultLength = 0;
-            boolean wasPrevTranslated = false;
-            for (int i = 0; i < length; i++)
-            {
-                char c = input.charAt(i);
-                if (i > 0 || c != '_') // skip first starting underscore
-                {
-                    if (Character.isUpperCase(c))
-                    {
-                        if (!wasPrevTranslated && resultLength > 0 && result.charAt(resultLength - 1) != '_')
-                        {
-                            result.append('_');
-                            resultLength++;
-                        }
-                        c = Character.toLowerCase(c);
-                        wasPrevTranslated = true;
-                    }
-                    else
-                    {
-                        wasPrevTranslated = false;
-                    }
-                    result.append(c);
-                    resultLength++;
-                }
-            }
-            return resultLength > 0 ? result.toString() : input;
+            return NamingStrategyImpls.SNAKE_CASE.translate(input);
         }
     }
 
@@ -281,11 +218,7 @@ public static class UpperSnakeCaseStrategy extends SnakeCaseStrategy
 
         @Override
         public String translate(String input) {
-            String output = super.translate(input);
-            if (output == null) {
-                return null;
-            }
-            return output.toUpperCase();
+            return NamingStrategyImpls.UPPER_SNAKE_CASE.translate(input);
         }
     }
 
@@ -305,7 +238,7 @@ public static class LowerCamelCaseStrategy extends NamingBase
 
         @Override
         public String translate(String input) {
-            return input;
+            return NamingStrategyImpls.LOWER_CAMEL_CASE.translate(input);
         }
     }
 
@@ -343,18 +276,7 @@ public static class UpperCamelCaseStrategy extends NamingBase
          */
         @Override
         public String translate(String input) {
-            if (input == null || input.isEmpty()){
-                return input; // garbage in, garbage out
-            }
-            // Replace first lower-case letter with upper-case equivalent
-            char c = input.charAt(0);
-            char uc = Character.toUpperCase(c);
-            if (c == uc) {
-                return input;
-            }
-            StringBuilder sb = new StringBuilder(input);
-            sb.setCharAt(0, uc);
-            return sb.toString();
+            return NamingStrategyImpls.UPPER_CAMEL_CASE.translate(input);
         }
     }
 
@@ -376,10 +298,7 @@ public static class LowerCaseStrategy extends NamingBase
 
         @Override
         public String translate(String input) {
-            if (input == null || input.isEmpty()) {
-                return input;
-            }
-            return input.toLowerCase();
+            return NamingStrategyImpls.LOWER_CASE.translate(input);
         }
     }
 
@@ -401,7 +320,7 @@ public static class KebabCaseStrategy extends NamingBase
 
         @Override
         public String translate(String input) {
-            return translateLowerCaseWithSeparator(input, '-');
+            return NamingStrategyImpls.KEBAB_CASE.translate(input);
         }
     }
 
@@ -422,7 +341,7 @@ public static class LowerDotCaseStrategy extends NamingBase
 
         @Override
         public String translate(String input){
-            return translateLowerCaseWithSeparator(input, '.');
+            return NamingStrategyImpls.LOWER_DOT_CASE.translate(input);
         }
     }
 }
diff --git a/src/main/java/com/fasterxml/jackson/databind/cfg/BaseSettings.java b/src/main/java/com/fasterxml/jackson/databind/cfg/BaseSettings.java
index de46bdeb24..57b7ec92e4 100644
--- a/src/main/java/com/fasterxml/jackson/databind/cfg/BaseSettings.java
+++ b/src/main/java/com/fasterxml/jackson/databind/cfg/BaseSettings.java
@@ -10,7 +10,6 @@
 import com.fasterxml.jackson.databind.introspect.AccessorNamingStrategy;
 import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
 import com.fasterxml.jackson.databind.introspect.ClassIntrospector;
-import com.fasterxml.jackson.databind.introspect.DefaultAccessorNamingStrategy;
 import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
 import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
 import com.fasterxml.jackson.databind.type.TypeFactory;
@@ -67,6 +66,13 @@ public final class BaseSettings
      */
     protected final PropertyNamingStrategy _propertyNamingStrategy;
 
+    /**
+     * Custom enum naming strategy in use, if any.
+     *
+     * @since 2.19
+     */
+    protected final EnumNamingStrategy _enumNamingStrategy;
+
     /**
      * Provider for creating {@link AccessorNamingStrategy} instances to use
      *
@@ -157,10 +163,10 @@ public final class BaseSettings
      */
 
     /**
-     * @since 2.16
+     * @since 2.19
      */
     public BaseSettings(ClassIntrospector ci, AnnotationIntrospector ai,
-            PropertyNamingStrategy pns, TypeFactory tf,
+            PropertyNamingStrategy pns, EnumNamingStrategy ens, TypeFactory tf,
             TypeResolverBuilder<?> typer, DateFormat dateFormat, HandlerInstantiator hi,
             Locale locale, TimeZone tz, Base64Variant defaultBase64,
             PolymorphicTypeValidator ptv, AccessorNamingStrategy.Provider accNaming,
@@ -169,6 +175,7 @@ public BaseSettings(ClassIntrospector ci, AnnotationIntrospector ai,
         _classIntrospector = ci;
         _annotationIntrospector = ai;
         _propertyNamingStrategy = pns;
+        _enumNamingStrategy = ens;
         _typeFactory = tf;
         _typeResolverBuilder = typer;
         _dateFormat = dateFormat;
@@ -182,29 +189,33 @@ public BaseSettings(ClassIntrospector ci, AnnotationIntrospector ai,
     }
 
     /**
-     * @since 2.12
-     * @deprecated Since 2.16, use variant that takes {@link CacheProvider} instead.
+     * @since 2.16
+     * @deprecated Since 2.19, use variant that takes {@link EnumNamingStrategy} instead.
      */
     @Deprecated
     public BaseSettings(ClassIntrospector ci, AnnotationIntrospector ai,
             PropertyNamingStrategy pns, TypeFactory tf,
             TypeResolverBuilder<?> typer, DateFormat dateFormat, HandlerInstantiator hi,
             Locale locale, TimeZone tz, Base64Variant defaultBase64,
-            PolymorphicTypeValidator ptv, AccessorNamingStrategy.Provider accNaming)
+            PolymorphicTypeValidator ptv, AccessorNamingStrategy.Provider accNaming,
+            CacheProvider cacheProvider)
     {
-        this(ci, ai, pns, tf, typer, dateFormat, hi, locale, tz, defaultBase64, ptv, accNaming, 
-                DefaultCacheProvider.defaultInstance());
+        this(ci, ai, pns, null, tf, typer, dateFormat, hi, locale, tz, defaultBase64, ptv, accNaming, cacheProvider);
     }
 
-    @Deprecated // since 2.12
+    /**
+     * @since 2.12
+     * @deprecated Since 2.16, use variant that takes {@link CacheProvider} instead.
+     */
+    @Deprecated
     public BaseSettings(ClassIntrospector ci, AnnotationIntrospector ai,
             PropertyNamingStrategy pns, TypeFactory tf,
             TypeResolverBuilder<?> typer, DateFormat dateFormat, HandlerInstantiator hi,
             Locale locale, TimeZone tz, Base64Variant defaultBase64,
-            PolymorphicTypeValidator ptv)
+            PolymorphicTypeValidator ptv, AccessorNamingStrategy.Provider accNaming)
     {
-        this(ci, ai, pns, tf, typer, dateFormat, hi, locale, tz, defaultBase64, ptv,
-                new DefaultAccessorNamingStrategy.Provider(), DefaultCacheProvider.defaultInstance());
+        this(ci, ai, pns, tf, typer, dateFormat, hi, locale, tz, defaultBase64, ptv, accNaming, 
+                DefaultCacheProvider.defaultInstance());
     }
 
     /**
@@ -217,6 +228,7 @@ public BaseSettings copy() {
         return new BaseSettings(_classIntrospector.copy(),
             _annotationIntrospector,
             _propertyNamingStrategy,
+            _enumNamingStrategy,
             _typeFactory,
             _typeResolverBuilder,
             _dateFormat,
@@ -239,8 +251,8 @@ public BaseSettings withClassIntrospector(ClassIntrospector ci) {
         if (_classIntrospector == ci) {
             return this;
         }
-        return new BaseSettings(ci, _annotationIntrospector, _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
+        return new BaseSettings(ci, _annotationIntrospector, _propertyNamingStrategy, _enumNamingStrategy,
+                _typeFactory, _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
                 _timeZone, _defaultBase64, _typeValidator, _accessorNaming, _cacheProvider);
     }
 
@@ -248,8 +260,8 @@ public BaseSettings withAnnotationIntrospector(AnnotationIntrospector ai) {
         if (_annotationIntrospector == ai) {
             return this;
         }
-        return new BaseSettings(_classIntrospector, ai, _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
+        return new BaseSettings(_classIntrospector, ai, _propertyNamingStrategy, _enumNamingStrategy,
+                _typeFactory, _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
                 _timeZone, _defaultBase64, _typeValidator, _accessorNaming, _cacheProvider);
     }
 
@@ -275,8 +287,20 @@ public BaseSettings withPropertyNamingStrategy(PropertyNamingStrategy pns) {
         if (_propertyNamingStrategy == pns) {
             return this;
         }
-        return new BaseSettings(_classIntrospector, _annotationIntrospector, pns, _typeFactory,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
+        return new BaseSettings(_classIntrospector, _annotationIntrospector, pns, _enumNamingStrategy,
+                _typeFactory, _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
+                _timeZone, _defaultBase64, _typeValidator, _accessorNaming, _cacheProvider);
+    }
+
+    /**
+     * @since 2.19
+     */
+    public BaseSettings withEnumNamingStrategy(EnumNamingStrategy ens) {
+        if (_enumNamingStrategy == ens) {
+            return this;
+        }
+        return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, ens,
+                _typeFactory, _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
                 _timeZone, _defaultBase64, _typeValidator, _accessorNaming, _cacheProvider);
     }
 
@@ -285,8 +309,8 @@ public BaseSettings withAccessorNaming(AccessorNamingStrategy.Provider p) {
         if (_accessorNaming == p) {
             return this;
         }
-        return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
+        return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, _enumNamingStrategy,
+                _typeFactory, _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
                 _timeZone, _defaultBase64, _typeValidator, p, _cacheProvider);
     }
 
@@ -294,8 +318,8 @@ public BaseSettings withTypeFactory(TypeFactory tf) {
         if (_typeFactory == tf) {
             return this;
         }
-        return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, tf,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
+        return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, _enumNamingStrategy,
+                tf, _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
                 _timeZone, _defaultBase64, _typeValidator, _accessorNaming, _cacheProvider);
     }
 
@@ -303,8 +327,8 @@ public BaseSettings withTypeResolverBuilder(TypeResolverBuilder<?> typer) {
         if (_typeResolverBuilder == typer) {
             return this;
         }
-        return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, _typeFactory,
-                typer, _dateFormat, _handlerInstantiator, _locale,
+        return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, _enumNamingStrategy,
+                _typeFactory, typer, _dateFormat, _handlerInstantiator, _locale,
                 _timeZone, _defaultBase64, _typeValidator, _accessorNaming, _cacheProvider);
     }
 
@@ -317,8 +341,8 @@ public BaseSettings withDateFormat(DateFormat df) {
         if ((df != null) && hasExplicitTimeZone()) {
             df = _force(df, _timeZone);
         }
-        return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, df, _handlerInstantiator, _locale,
+        return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, _enumNamingStrategy,
+                _typeFactory, _typeResolverBuilder, df, _handlerInstantiator, _locale,
                 _timeZone, _defaultBase64, _typeValidator, _accessorNaming, _cacheProvider);
     }
 
@@ -326,8 +350,8 @@ public BaseSettings withHandlerInstantiator(HandlerInstantiator hi) {
         if (_handlerInstantiator == hi) {
             return this;
         }
-        return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, _dateFormat, hi, _locale,
+        return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, _enumNamingStrategy,
+                _typeFactory, _typeResolverBuilder, _dateFormat, hi, _locale,
                 _timeZone, _defaultBase64, _typeValidator, _accessorNaming, _cacheProvider);
     }
 
@@ -335,8 +359,8 @@ public BaseSettings with(Locale l) {
         if (_locale == l) {
             return this;
         }
-        return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, l,
+        return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, _enumNamingStrategy,
+                _typeFactory,_typeResolverBuilder, _dateFormat, _handlerInstantiator, l,
                 _timeZone, _defaultBase64, _typeValidator, _accessorNaming, _cacheProvider);
     }
 
@@ -358,7 +382,7 @@ public BaseSettings with(TimeZone tz)
 
         DateFormat df = _force(_dateFormat, (tz == null) ? DEFAULT_TIMEZONE : tz);
         return new BaseSettings(_classIntrospector, _annotationIntrospector,
-                _propertyNamingStrategy, _typeFactory,
+                _propertyNamingStrategy, _enumNamingStrategy, _typeFactory,
                 _typeResolverBuilder, df, _handlerInstantiator, _locale,
                 tz, _defaultBase64, _typeValidator, _accessorNaming, _cacheProvider);
     }
@@ -371,7 +395,7 @@ public BaseSettings with(Base64Variant base64) {
             return this;
         }
         return new BaseSettings(_classIntrospector, _annotationIntrospector,
-                _propertyNamingStrategy, _typeFactory,
+                _propertyNamingStrategy, _enumNamingStrategy, _typeFactory,
                 _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
                 _timeZone, base64, _typeValidator, _accessorNaming, _cacheProvider);
     }
@@ -384,7 +408,7 @@ public BaseSettings with(PolymorphicTypeValidator v) {
             return this;
         }
         return new BaseSettings(_classIntrospector, _annotationIntrospector,
-                _propertyNamingStrategy, _typeFactory,
+                _propertyNamingStrategy, _enumNamingStrategy, _typeFactory,
                 _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
                 _timeZone, _defaultBase64, v, _accessorNaming, _cacheProvider);
     }
@@ -400,7 +424,7 @@ public BaseSettings with(CacheProvider cacheProvider) {
             return this;
         }
         return new BaseSettings(_classIntrospector, _annotationIntrospector,
-                _propertyNamingStrategy, _typeFactory,
+                _propertyNamingStrategy, _enumNamingStrategy, _typeFactory,
                 _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
                 _timeZone, _defaultBase64, _typeValidator, _accessorNaming, cacheProvider);
     }
@@ -423,6 +447,13 @@ public PropertyNamingStrategy getPropertyNamingStrategy() {
         return _propertyNamingStrategy;
     }
 
+    /**
+     * @since 2.19
+     */
+    public EnumNamingStrategy getEnumNamingStrategy() {
+        return _enumNamingStrategy;
+    }
+
     public AccessorNamingStrategy.Provider getAccessorNaming() {
         return _accessorNaming;
     }
diff --git a/src/main/java/com/fasterxml/jackson/databind/cfg/MapperBuilder.java b/src/main/java/com/fasterxml/jackson/databind/cfg/MapperBuilder.java
index 04dd3bac55..70e5099abf 100644
--- a/src/main/java/com/fasterxml/jackson/databind/cfg/MapperBuilder.java
+++ b/src/main/java/com/fasterxml/jackson/databind/cfg/MapperBuilder.java
@@ -511,6 +511,22 @@ public B propertyNamingStrategy(PropertyNamingStrategy s) {
         return _this();
     }
 
+    /**
+     * Method for configuring {@link EnumNamingStrategy} to use for adapting
+     * POJO enum names (internal) into content property names (external)
+     *
+     * @param s Strategy instance to use
+     *
+     * @return Builder instance itself to allow chaining
+     *
+     * @since 2.19
+     */
+    public B enumNamingStrategy(EnumNamingStrategy s) {
+        _mapper.setEnumNamingStrategy(s);
+        return _this();
+    }
+
+
     /**
      * Method for configuring {@link AccessorNamingStrategy} to use for auto-detecting
      * accessor ("getter") and mutator ("setter") methods based on naming of methods.
diff --git a/src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfig.java b/src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfig.java
index 8363ce6de0..9af4693d4d 100644
--- a/src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfig.java
+++ b/src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfig.java
@@ -272,6 +272,13 @@ public final PropertyNamingStrategy getPropertyNamingStrategy() {
         return _base.getPropertyNamingStrategy();
     }
 
+    /**
+     * @since 2.19
+     */
+    public final EnumNamingStrategy getEnumNamingStrategy() {
+        return _base.getEnumNamingStrategy();
+    }
+
     // @since 2.12
     public final AccessorNamingStrategy.Provider getAccessorNaming() {
         return _base.getAccessorNaming();
diff --git a/src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfigBase.java b/src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfigBase.java
index 843f8e4aed..58c610740e 100644
--- a/src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfigBase.java
+++ b/src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfigBase.java
@@ -562,6 +562,20 @@ public final T with(PropertyNamingStrategy pns) {
         return _withBase(_base.withPropertyNamingStrategy(pns));
     }
 
+    /**
+     * Method for constructing and returning a new instance with different
+     * {@link EnumNamingStrategy}
+     * to use.
+     *<p>
+     * NOTE: make sure to register new instance with <code>ObjectMapper</code>
+     * if directly calling this method.
+     *
+     * @since 2.19
+     */
+    public final T with(EnumNamingStrategy ens) {
+        return _withBase(_base.withEnumNamingStrategy(ens));
+    }
+
     /**
      * Method for constructing and returning a new instance with different
      * {@link PropertyNamingStrategy}
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java b/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java
index 2f52512c33..1460b84e4a 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java
@@ -453,6 +453,13 @@ private boolean _addExplicitDelegatingCreator(DeserializationContext ctxt,
         int ix = -1;
         final int argCount = candidate.paramCount();
         SettableBeanProperty[] properties = new SettableBeanProperty[argCount];
+        // [databind#4688]: Should still accept 0-arg (explicitly delegated) creator
+        //   for backwards-compatibility (worked in 2.17 and before)
+        if (argCount == 0) {
+            // "Convert" to property-based since that works well
+            creators.addPropertyCreator(candidate.creator(), true, properties);
+            return true;
+        }
         for (int i = 0; i < argCount; ++i) {
             AnnotatedParameter param = candidate.parameter(i);
             JacksonInject.Value injectId = candidate.injection(i);
@@ -1825,7 +1832,7 @@ protected EnumResolver constructEnumNamingStrategyResolver(DeserializationConfig
     {
         Object namingDef = config.getAnnotationIntrospector().findEnumNamingStrategy(config, annotatedClass);
         EnumNamingStrategy enumNamingStrategy = EnumNamingStrategyFactory.createEnumNamingStrategyInstance(
-                namingDef, config.canOverrideAccessModifiers());
+                namingDef, config.canOverrideAccessModifiers(), config.getEnumNamingStrategy());
         return enumNamingStrategy == null ? null
                 : EnumResolver.constructUsingEnumNamingStrategy(config, annotatedClass, enumNamingStrategy);
     }
@@ -1842,7 +1849,7 @@ protected EnumResolver constructEnumNamingStrategyResolver(DeserializationConfig
             AnnotatedClass annotatedClass) {
         Object namingDef = config.getAnnotationIntrospector().findEnumNamingStrategy(config, annotatedClass);
         EnumNamingStrategy enumNamingStrategy = EnumNamingStrategyFactory.createEnumNamingStrategyInstance(
-            namingDef, config.canOverrideAccessModifiers());
+            namingDef, config.canOverrideAccessModifiers(), config.getEnumNamingStrategy());
         return enumNamingStrategy == null ? null
             : EnumResolver.constructUsingEnumNamingStrategy(config, enumClass, enumNamingStrategy);
     }
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
index cafd0253c5..9e0b714fba 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
@@ -505,7 +505,12 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
             // "any property"?
             if (_anySetter != null) {
                 try {
-                    buffer.bufferAnyParameterProperty(_anySetter, propName, _anySetter.deserialize(p, ctxt));
+                    // [databind#4639] Since 2.18.1 AnySetter might not part of the creator, but just some field.
+                    if (_anySetter.isFieldType()) {
+                        buffer.bufferAnyProperty(_anySetter, propName, _anySetter.deserialize(p, ctxt));
+                    } else {
+                        buffer.bufferAnyParameterProperty(_anySetter, propName, _anySetter.deserialize(p, ctxt));
+                    }
                 } catch (Exception e) {
                     wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
                 }
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/SettableAnyProperty.java b/src/main/java/com/fasterxml/jackson/databind/deser/SettableAnyProperty.java
index 0cb738ada7..11998275f4 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/SettableAnyProperty.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/SettableAnyProperty.java
@@ -194,6 +194,13 @@ Object readResolve() {
      */
     public int getParameterIndex() { return -1; }
 
+    /**
+     * Method called to check whether this property is field
+     *
+     * @since 2.18.1
+     */
+    public boolean isFieldType() { return _setterIsField; }
+
     /**
      * Create an instance of value to pass through Creator parameter.
      *
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer.java b/src/main/java/com/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer.java
index 531c6ab24e..31d2b76bd3 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer.java
@@ -135,10 +135,24 @@ public PropertyValueBuffer(JsonParser p, DeserializationContext ctxt, int paramC
      */
     public final boolean hasParameter(SettableBeanProperty prop)
     {
+        final int ix = prop.getCreatorIndex();
+
         if (_paramsSeenBig == null) {
-            return ((_paramsSeen >> prop.getCreatorIndex()) & 1) == 1;
+            if (((_paramsSeen >> ix) & 1) == 1) {
+                return true;
+            }
+        } else {
+            if (_paramsSeenBig.get(ix)) {
+                return true;
+            }
         }
-        return _paramsSeenBig.get(prop.getCreatorIndex());
+        // 28-Sep-2024 : [databind#4508] Support any-setter flowing through creator
+        if (_anyParamSetter != null) {
+            if (ix == _anyParamSetter.getParameterIndex()) {
+                return true;
+            }
+        }
+        return false;
     }
 
     /**
@@ -160,6 +174,11 @@ public Object getParameter(SettableBeanProperty prop)
         } else {
             value = _creatorParameters[prop.getCreatorIndex()] = _findMissing(prop);
         }
+        // 28-Sep-2024 : [databind#4508] Support any-setter flowing through creator
+        if ((value == null) && (_anyParamSetter != null )
+                && (prop.getCreatorIndex() == _anyParamSetter.getParameterIndex())) {
+            value = _createAndSetAnySetterValue();
+        }
         if (value == null && _context.isEnabled(DeserializationFeature.FAIL_ON_NULL_CREATOR_PROPERTIES)) {
             return _context.reportInputMismatch(prop,
                 "Null value for creator property '%s' (index %d); `DeserializationFeature.FAIL_ON_NULL_CREATOR_PROPERTIES` enabled",
@@ -198,11 +217,7 @@ public Object[] getParameters(SettableBeanProperty[] props)
         }
         // [databind#562] since 2.18 : Respect @JsonAnySetter in @JsonCreator
         if (_anyParamSetter != null) {
-            Object anySetterParameterObject = _anyParamSetter.createParameterObject();
-            for (PropertyValue pv = _anyParamBuffered; pv != null; pv = pv.next) {
-                pv.setValue(anySetterParameterObject);
-            }
-            _creatorParameters[_anyParamSetter.getParameterIndex()] = anySetterParameterObject;
+            _creatorParameters[_anyParamSetter.getParameterIndex()] = _createAndSetAnySetterValue();
         }
         if (_context.isEnabled(DeserializationFeature.FAIL_ON_NULL_CREATOR_PROPERTIES)) {
             for (int ix = 0; ix < props.length; ++ix) {
@@ -217,6 +232,27 @@ public Object[] getParameters(SettableBeanProperty[] props)
         return _creatorParameters;
     }
 
+    /**
+     * Helper method called to create and set any values buffered for "any setter"
+     */
+    private Object _createAndSetAnySetterValue() throws JsonMappingException
+    {
+        Object anySetterParameterObject = _anyParamSetter.createParameterObject();
+        for (PropertyValue pv = _anyParamBuffered; pv != null; pv = pv.next) {
+            try {
+                pv.setValue(anySetterParameterObject);
+
+            // Since one of callers only exposes JsonMappingException, but pv.setValue()
+            // nominally leaks IOException, need to do this unfortunate conversion
+            } catch (JsonMappingException e) {
+                throw e;
+            } catch (IOException e) {
+                throw JsonMappingException.fromUnexpectedIOE(e);
+            }
+        }
+        return anySetterParameterObject;
+    }
+
     protected Object _findMissing(SettableBeanProperty prop) throws JsonMappingException
     {
         // 08-Jun-2024: [databind#562] AnySetters are bit special
diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/EnumNamingStrategyFactory.java b/src/main/java/com/fasterxml/jackson/databind/introspect/EnumNamingStrategyFactory.java
index bb5cecde2f..9d57b5304b 100644
--- a/src/main/java/com/fasterxml/jackson/databind/introspect/EnumNamingStrategyFactory.java
+++ b/src/main/java/com/fasterxml/jackson/databind/introspect/EnumNamingStrategyFactory.java
@@ -33,10 +33,34 @@ private EnumNamingStrategyFactory() {}
      *                                  not a subclass of {@link EnumNamingStrategy}.
      *                                  
      * @since 2.15
+     * @deprecated Since 2.19, use variant that takes {@link EnumNamingStrategy} instead.
      */
+    @Deprecated
     public static EnumNamingStrategy createEnumNamingStrategyInstance(Object namingDef, boolean canOverrideAccessModifiers) {
+        return createEnumNamingStrategyInstance(namingDef, canOverrideAccessModifiers, null);
+    }
+
+    /**
+     * Factory method for creating an instance of {@link EnumNamingStrategy} from a provided {@code namingDef}.
+     *
+     * @param namingDef                  subclass of {@link EnumNamingStrategy} to initialize an instance of.
+     * @param canOverrideAccessModifiers whether to override access modifiers when instantiating the naming strategy.
+     * @param defaultNamingStrategy      configured global {@link EnumNamingStrategy} to use in case {@code namingDef} is not provided.
+     *
+     * @return an instance of {@link EnumNamingStrategy} if {@code namingDef} is a subclass of {@link EnumNamingStrategy},
+     * {@code defaultNamingStrategy} if {@code namingDef} is {@code null},
+     * and an instance of {@link EnumNamingStrategy} if {@code namingDef} already is one.
+     *
+     * @throws IllegalArgumentException if {@code namingDef} is not an instance of {@link java.lang.Class} or
+     *                                  not a subclass of {@link EnumNamingStrategy}.
+     *
+     * @since 2.19
+     */
+    public static EnumNamingStrategy createEnumNamingStrategyInstance(Object namingDef,
+                                                                      boolean canOverrideAccessModifiers,
+                                                                      EnumNamingStrategy defaultNamingStrategy) {
         if (namingDef == null) {
-            return null;
+            return defaultNamingStrategy;
         }
         if (namingDef instanceof EnumNamingStrategy) {
             return (EnumNamingStrategy) namingDef;
diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/MemberKey.java b/src/main/java/com/fasterxml/jackson/databind/introspect/MemberKey.java
index 58563b8cc0..60b693a9d2 100644
--- a/src/main/java/com/fasterxml/jackson/databind/introspect/MemberKey.java
+++ b/src/main/java/com/fasterxml/jackson/databind/introspect/MemberKey.java
@@ -17,12 +17,12 @@ public final class MemberKey
 
     public MemberKey(Method m)
     {
-        this(m.getName(), m.getParameterTypes());
+        this(m.getName(), m.getParameterCount() > 0 ? m.getParameterTypes() : NO_CLASSES);
     }
 
     public MemberKey(Constructor<?> ctor)
     {
-        this("", ctor.getParameterTypes());
+        this("", ctor.getParameterCount() > 0 ? ctor.getParameterTypes() : NO_CLASSES);
     }
 
     public MemberKey(String name, Class<?>[] argTypes)
diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector.java b/src/main/java/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector.java
index 175d63f267..5c7b606a68 100644
--- a/src/main/java/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector.java
+++ b/src/main/java/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector.java
@@ -657,14 +657,14 @@ protected void _addCreators(Map<String, POJOPropertyBuilder> props)
         List<PotentialCreator> constructors = _collectCreators(_classDef.getConstructors());
         List<PotentialCreator> factories = _collectCreators(_classDef.getFactoryMethods());
 
-        // Then find what is the Primary Constructor (if one exists for type):
+        // Then find what is the Default Constructor (if one exists for type):
         // for Java Records and potentially other types too ("data classes"):
         // Needs to be done early to get implicit names populated
-        final PotentialCreator primary;
+        final PotentialCreator defaultCreator;
         if (_isRecordType) {
-            primary = JDK14Util.findCanonicalRecordConstructor(_config, _classDef, constructors);
+            defaultCreator = JDK14Util.findCanonicalRecordConstructor(_config, _classDef, constructors);
         } else {
-            primary = _annotationIntrospector.findDefaultCreator(_config, _classDef,
+            defaultCreator = _annotationIntrospector.findDefaultCreator(_config, _classDef,
                     constructors, factories);
         }
         // Next: remove creators marked as explicitly disabled
@@ -672,7 +672,7 @@ protected void _addCreators(Map<String, POJOPropertyBuilder> props)
         _removeDisabledCreators(factories);
         
         // And then remove non-annotated static methods that do not look like factories
-        _removeNonFactoryStaticMethods(factories, primary);
+        _removeNonFactoryStaticMethods(factories, defaultCreator);
 
         // and use annotations to find explicitly chosen Creators
         if (_useAnnotations) { // can't have explicit ones without Annotation introspection
@@ -687,21 +687,26 @@ protected void _addCreators(Map<String, POJOPropertyBuilder> props)
         // for ones with explicitly-named ({@code @JsonProperty}) parameters
         if (!creators.hasPropertiesBased()) {
             // only discover constructor Creators?
-            _addCreatorsWithAnnotatedNames(creators, constructors, primary);
+            _addCreatorsWithAnnotatedNames(creators, constructors, defaultCreator);
         }
 
-        // But if no annotation-based Creators found, find/use Primary Creator
+        // But if no annotation-based Creators found, find/use Default Creator
         // detected earlier, if any
-        if (primary != null) {
-            if (!creators.hasPropertiesBased()) {
-                // ... but only process if still included as a candidate
-                if (constructors.remove(primary)
-                        || factories.remove(primary)) {
-                    // But wait! Could be delegating
-                    if (_isDelegatingConstructor(primary)) {
-                        creators.addExplicitDelegating(primary);
-                    } else {
-                        creators.setPropertiesBased(_config, primary, "Primary");
+        if (defaultCreator != null) {
+            // ... but only process if still included as a candidate
+            if (constructors.remove(defaultCreator)
+                    || factories.remove(defaultCreator)) {
+                // and then consider delegating- vs properties-based
+                if (_isDelegatingConstructor(defaultCreator)) {
+                    // 08-Oct-2024, tatu: [databind#4724] Only add if no explicit
+                    //    candidates added
+                    if (!creators.hasDelegating()) {
+                        // ... not technically explicit but simpler this way
+                        creators.addExplicitDelegating(defaultCreator);
+                    }
+                } else { // default creator is properties-based
+                    if (!creators.hasPropertiesBased()) {
+                        creators.setPropertiesBased(_config, defaultCreator, "Primary");
                     }
                 }
             }
@@ -800,7 +805,7 @@ private void _removeNonVisibleCreators(List<PotentialCreator> ctors)
     }
 
     private void _removeNonFactoryStaticMethods(List<PotentialCreator> ctors,
-            PotentialCreator canonical)
+            PotentialCreator defaultCreator)
     {
         final Class<?> rawType = _type.getRawClass();
         Iterator<PotentialCreator> it = ctors.iterator();
@@ -811,7 +816,7 @@ private void _removeNonFactoryStaticMethods(List<PotentialCreator> ctors,
                 continue;
             }
             // Do not trim canonical either
-            if (canonical == ctor) {
+            if (defaultCreator == ctor) {
                 continue;
             }
             // Copied from `BasicBeanDescription.isFactoryMethod()`
diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/PotentialCreators.java b/src/main/java/com/fasterxml/jackson/databind/introspect/PotentialCreators.java
index 4441621aec..19c2358a92 100644
--- a/src/main/java/com/fasterxml/jackson/databind/introspect/PotentialCreators.java
+++ b/src/main/java/com/fasterxml/jackson/databind/introspect/PotentialCreators.java
@@ -56,6 +56,11 @@ public void setImplicitDelegating(List<PotentialCreator> implicitConstructors,
     /**********************************************************************
      */
 
+    // @since 2.18.1
+    public boolean hasDelegating() {
+        return (explicitDelegating != null) && !explicitDelegating.isEmpty();
+    }
+    
     public boolean hasPropertiesBased() {
         return (propertiesBased != null);
     }
diff --git a/src/main/java/com/fasterxml/jackson/databind/node/ArrayNode.java b/src/main/java/com/fasterxml/jackson/databind/node/ArrayNode.java
index 889bbe7d07..60f13a07c6 100644
--- a/src/main/java/com/fasterxml/jackson/databind/node/ArrayNode.java
+++ b/src/main/java/com/fasterxml/jackson/databind/node/ArrayNode.java
@@ -246,9 +246,16 @@ public int size() {
     @Override // since 2.10
     public boolean isEmpty() { return _children.isEmpty(); }
 
+    /**
+     * {@inheritDoc}
+     *<p>
+     * NOTE: actual underlying implementation returns {@link java.util.ListIterator}
+     * from {@link java.util.List#listIterator()} that contains elements, since Jackson 2.18
+     * (before was only generic {@link java.util.Iterator}).
+     */
     @Override
     public Iterator<JsonNode> elements() {
-        return _children.iterator();
+        return _children.listIterator();
     }
 
     @Override
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.java b/src/main/java/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.java
index 812c239032..45ec7a0ba5 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.java
@@ -222,8 +222,7 @@ public BeanPropertyWriter(BeanPropertyDefinition propDef,
 
         _declaredType = declaredType;
         _serializer = (JsonSerializer<Object>) ser;
-        _dynamicSerializers = (ser == null) ? PropertySerializerMap
-                .emptyForProperties() : null;
+        _dynamicSerializers = (ser == null) ? PropertySerializerMap.emptyForProperties() : null;
         _typeSerializer = typeSer;
         _cfgSerializationType = serType;
 
@@ -325,7 +324,7 @@ protected BeanPropertyWriter(BeanPropertyWriter base, PropertyName name) {
                     base._internalSettings);
         }
         _cfgSerializationType = base._cfgSerializationType;
-        _dynamicSerializers = base._dynamicSerializers;
+        _dynamicSerializers = PropertySerializerMap.emptyForProperties();
         _suppressNulls = base._suppressNulls;
         _suppressableValue = base._suppressableValue;
         _includeInViews = base._includeInViews;
@@ -350,7 +349,7 @@ protected BeanPropertyWriter(BeanPropertyWriter base, SerializedString name) {
                     base._internalSettings);
         }
         _cfgSerializationType = base._cfgSerializationType;
-        _dynamicSerializers = base._dynamicSerializers;
+        _dynamicSerializers = PropertySerializerMap.emptyForProperties();
         _suppressNulls = base._suppressNulls;
         _suppressableValue = base._suppressableValue;
         _includeInViews = base._includeInViews;
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/PropertyBuilder.java b/src/main/java/com/fasterxml/jackson/databind/ser/PropertyBuilder.java
index 3ea096d672..8ba0df005f 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/PropertyBuilder.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/PropertyBuilder.java
@@ -182,8 +182,12 @@ protected BeanPropertyWriter buildWriter(SerializerProvider prov,
             }
             if (valueToSuppress == null) {
                 suppressNulls = true;
-                // [databind#4464] NON_DEFAULT does not work with NON_EMPTY for custom serializer
-                valueToSuppress = BeanPropertyWriter.MARKER_FOR_EMPTY;
+                // [databind#4471] Different behavior when Include.NON_DEFAULT
+                //   setting is used on POJO vs global setting, as per documentation.
+                if (!_useRealPropertyDefaults) {
+                    // [databind#4464] NON_DEFAULT does not work with NON_EMPTY for custom serializer
+                    valueToSuppress = BeanPropertyWriter.MARKER_FOR_EMPTY;
+                }
             } else {
                 if (valueToSuppress.getClass().isArray()) {
                     valueToSuppress = ArrayBuilders.getArrayComparator(valueToSuppress);
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.java
index f555307791..821439b0c0 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.java
@@ -38,7 +38,7 @@ public class StringArraySerializer
 
     /**
      * Value serializer to use, if it's not the standard one
-     * (if it is we can optimize serialization a lot)
+     * (if it is we can optimize serialization significantly)
      */
     protected final JsonSerializer<Object> _elementSerializer;
 
@@ -85,10 +85,9 @@ public JsonSerializer<?> createContextual(SerializerProvider provider,
             BeanProperty property)
         throws JsonMappingException
     {
-        /* 29-Sep-2012, tatu: Actually, we need to do much more contextual
-         *    checking here since we finally know for sure the property,
-         *    and it may have overrides
-         */
+        // 29-Sep-2012, tatu: Actually, we need to do much more contextual
+        //    checking here since we finally know for sure the property,
+        //    and it may have overrides
         JsonSerializer<?> ser = null;
 
         // First: if we have a property, may have property-annotation overrides
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/EnumSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/EnumSerializer.java
index efc8d67ee2..f775d3fd78 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/EnumSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/EnumSerializer.java
@@ -297,7 +297,7 @@ protected static EnumValues constructEnumNamingStrategyValues(SerializationConfi
         Object namingDef = config.getAnnotationIntrospector().findEnumNamingStrategy(config,
                 annotatedClass);
         EnumNamingStrategy enumNamingStrategy = EnumNamingStrategyFactory.createEnumNamingStrategyInstance(
-            namingDef, config.canOverrideAccessModifiers());
+            namingDef, config.canOverrideAccessModifiers(), config.getEnumNamingStrategy());
         return enumNamingStrategy == null ? null : EnumValues.constructUsingEnumNamingStrategy(
             config, annotatedClass, enumNamingStrategy);
     }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/StdArraySerializers.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/StdArraySerializers.java
index d5ea4cfd03..2a04bbb973 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/StdArraySerializers.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/StdArraySerializers.java
@@ -23,17 +23,17 @@
 public class StdArraySerializers
 {
     protected final static HashMap<String, JsonSerializer<?>> _arraySerializers =
-        new HashMap<String, JsonSerializer<?>>();
+        new HashMap<>();
     static {
         // Arrays of various types (including common object types)
-        _arraySerializers.put(boolean[].class.getName(), new StdArraySerializers.BooleanArraySerializer());
+        _arraySerializers.put(boolean[].class.getName(), new BooleanArraySerializer());
         _arraySerializers.put(byte[].class.getName(), new ByteArraySerializer());
-        _arraySerializers.put(char[].class.getName(), new StdArraySerializers.CharArraySerializer());
-        _arraySerializers.put(short[].class.getName(), new StdArraySerializers.ShortArraySerializer());
-        _arraySerializers.put(int[].class.getName(), new StdArraySerializers.IntArraySerializer());
-        _arraySerializers.put(long[].class.getName(), new StdArraySerializers.LongArraySerializer());
-        _arraySerializers.put(float[].class.getName(), new StdArraySerializers.FloatArraySerializer());
-        _arraySerializers.put(double[].class.getName(), new StdArraySerializers.DoubleArraySerializer());
+        _arraySerializers.put(char[].class.getName(), new CharArraySerializer());
+        _arraySerializers.put(short[].class.getName(), new ShortArraySerializer());
+        _arraySerializers.put(int[].class.getName(), new IntArraySerializer());
+        _arraySerializers.put(long[].class.getName(), new LongArraySerializer());
+        _arraySerializers.put(float[].class.getName(), new FloatArraySerializer());
+        _arraySerializers.put(double[].class.getName(), new DoubleArraySerializer());
     }
 
     protected StdArraySerializers() { }
@@ -46,6 +46,12 @@ public static JsonSerializer<?> findStandardImpl(Class<?> cls) {
         return _arraySerializers.get(cls.getName());
     }
 
+    // @since 2.19
+    @SuppressWarnings("deprecation")
+    static JavaType simpleElementType(Class<?> elemClass) {
+        return TypeFactory.defaultInstance().uncheckedSimpleType(elemClass);
+    }
+
     /*
      ****************************************************************
     /* Intermediate base classes
@@ -88,8 +94,7 @@ public static class BooleanArraySerializer
         extends ArraySerializerBase<boolean[]>
     {
         // as above, assuming no one re-defines primitive/wrapper types
-        @SuppressWarnings("deprecation")
-        private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(Boolean.class);
+        private final static JavaType VALUE_TYPE = simpleElementType(Boolean.TYPE);
 
         public BooleanArraySerializer() { super(boolean[].class); }
 
@@ -179,8 +184,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
     public static class ShortArraySerializer extends TypedPrimitiveArraySerializer<short[]>
     {
         // as above, assuming no one re-defines primitive/wrapper types
-        @SuppressWarnings("deprecation")
-        private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(Short.TYPE);
+        private final static JavaType VALUE_TYPE = simpleElementType(Short.TYPE);
 
         public ShortArraySerializer() { super(short[].class); }
         public ShortArraySerializer(ShortArraySerializer src, BeanProperty prop,
@@ -340,8 +344,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
     public static class IntArraySerializer extends ArraySerializerBase<int[]>
     {
         // as above, assuming no one re-defines primitive/wrapper types
-        @SuppressWarnings("deprecation")
-        private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(Integer.TYPE);
+        private final static JavaType VALUE_TYPE = simpleElementType(Integer.TYPE);
 
         public IntArraySerializer() { super(int[].class); }
 
@@ -429,8 +432,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
     public static class LongArraySerializer extends TypedPrimitiveArraySerializer<long[]>
     {
         // as above, assuming no one re-defines primitive/wrapper types
-        @SuppressWarnings("deprecation")
-        private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(Long.TYPE);
+        private final static JavaType VALUE_TYPE = simpleElementType(Long.TYPE);
 
         public LongArraySerializer() { super(long[].class); }
         public LongArraySerializer(LongArraySerializer src, BeanProperty prop,
@@ -508,8 +510,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
     public static class FloatArraySerializer extends TypedPrimitiveArraySerializer<float[]>
     {
         // as above, assuming no one re-defines primitive/wrapper types
-        @SuppressWarnings("deprecation")
-        private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(Float.TYPE);
+        private final static JavaType VALUE_TYPE = simpleElementType(Float.TYPE);
 
         public FloatArraySerializer() {
             super(float[].class);
@@ -587,8 +588,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
     public static class DoubleArraySerializer extends ArraySerializerBase<double[]>
     {
         // as above, assuming no one re-defines primitive/wrapper types
-        @SuppressWarnings("deprecation")
-        private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(Double.TYPE);
+        private final static JavaType VALUE_TYPE = simpleElementType(Double.TYPE);
 
         public DoubleArraySerializer() { super(double[].class); }
 
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.java
index 6f3b014d22..36b1f59869 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.java
@@ -181,7 +181,7 @@ public void serializeWithType(Object value, JsonGenerator gen, SerializerProvide
         }
         JsonSerializer<Object> ser = _delegateSerializer;
         if (ser == null) {
-            ser = _findSerializer(value, provider);
+            ser = _findSerializer(delegateValue, provider);
         }
         ser.serializeWithType(delegateValue, gen, provider, typeSer);
     }
diff --git a/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java b/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
index e8a57c1f8c..5173b9ddf0 100644
--- a/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
+++ b/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
@@ -1,11 +1,6 @@
 package com.fasterxml.jackson.databind.type;
 
-import java.lang.reflect.Array;
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.lang.reflect.WildcardType;
+import java.lang.reflect.*;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.BaseStream;
@@ -18,10 +13,7 @@
 
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.util.ArrayBuilders;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-import com.fasterxml.jackson.databind.util.LRUMap;
-import com.fasterxml.jackson.databind.util.LookupCache;
+import com.fasterxml.jackson.databind.util.*;
 
 /**
  * Class used for creating concrete {@link JavaType} instances,
@@ -70,7 +62,6 @@
  *   </li>
  *</ul>
  */
-@SuppressWarnings({"rawtypes" })
 public class TypeFactory // note: was final in 2.9, removed from 2.10
     implements java.io.Serializable
 {
@@ -79,8 +70,6 @@ public class TypeFactory // note: was final in 2.9, removed from 2.10
     /**
      * Default size used to construct {@link #_typeCache}.
      *
-     * Used to be passed inline.
-     *
      * @since 2.16
      */
     public static final int DEFAULT_MAX_CACHE_SIZE = 200;
@@ -222,6 +211,14 @@ protected TypeFactory(LookupCache<Object,JavaType> typeCache, TypeParser p,
         _classLoader = classLoader;
     }
 
+    /**
+     * Method used to construct a new default/standard {@code TypeFactory}
+     * instance; an instance which has no custom configuration.
+     *
+     * @since 2.19
+     */
+    public static TypeFactory createDefaultInstance() { return new TypeFactory(); }
+
     /**
      * "Mutant factory" method which will construct a new instance with specified
      * {@link TypeModifier} added as the first modifier to call (in case there
@@ -316,7 +313,9 @@ public ClassLoader getClassLoader() {
      * <code>java.lang.Object</code>.
      */
     public static JavaType unknownType() {
-        return defaultInstance()._unknownType();
+        // 11-Oct-2024, tatu: Used to call via "defaultInstance()" pre-2.19 but
+        //   since we have static object to refer, just return directly
+        return CORE_TYPE_OBJECT;
     }
 
     /**
@@ -340,6 +339,8 @@ public static Class<?> rawClass(Type t) {
             return rawClass(((WildcardType) t).getUpperBounds()[0]);
         }
         // fallback
+        // 12-Oct-2024, tatu: Seems unnecessary (replacing with throw does not
+        //   fail any tests), but left for 2.x, changed in 3.0
         return defaultInstance().constructType(t).getRawClass();
     }
 
@@ -919,6 +920,7 @@ public ArrayType constructArrayType(JavaType elementType) {
      * NOTE: type modifiers are NOT called on Collection type itself; but are called
      * for contained types.
      */
+    @SuppressWarnings({"rawtypes" })
     public CollectionType constructCollectionType(Class<? extends Collection> collectionClass,
             Class<?> elementClass) {
         return constructCollectionType(collectionClass,
@@ -931,6 +933,7 @@ public CollectionType constructCollectionType(Class<? extends Collection> collec
      * NOTE: type modifiers are NOT called on Collection type itself; but are called
      * for contained types.
      */
+    @SuppressWarnings({"rawtypes" })
     public CollectionType constructCollectionType(Class<? extends Collection> collectionClass,
             JavaType elementType)
     {
@@ -982,6 +985,7 @@ public CollectionLikeType constructCollectionLikeType(Class<?> collectionClass,
      * NOTE: type modifiers are NOT called on constructed type itself; but are called
      * for contained types.
      */
+    @SuppressWarnings({"rawtypes" })
     public MapType constructMapType(Class<? extends Map> mapClass,
             Class<?> keyClass, Class<?> valueClass) {
         JavaType kt, vt;
@@ -999,6 +1003,7 @@ public MapType constructMapType(Class<? extends Map> mapClass,
      *<p>
      * NOTE: type modifiers are NOT called on constructed type itself.
      */
+    @SuppressWarnings({"rawtypes" })
     public MapType constructMapType(Class<? extends Map> mapClass, JavaType keyType, JavaType valueType) {
         TypeBindings bindings = TypeBindings.createIfNeeded(mapClass, new JavaType[] { keyType, valueType });
         MapType result = (MapType) _fromClass(null, mapClass, bindings);
@@ -1228,6 +1233,7 @@ public JavaType constructParametrizedType(Class<?> parametrized, Class<?> parame
      *<p>
      * This method should only be used if parameterization is completely unavailable.
      */
+    @SuppressWarnings({"rawtypes" })
     public CollectionType constructRawCollectionType(Class<? extends Collection> collectionClass) {
         return constructCollectionType(collectionClass, unknownType());
     }
@@ -1258,6 +1264,7 @@ public CollectionLikeType constructRawCollectionLikeType(Class<?> collectionClas
      *<p>
      * This method should only be used if parameterization is completely unavailable.
      */
+    @SuppressWarnings({"rawtypes" })
     public MapType constructRawMapType(Class<? extends Map> mapClass) {
         return constructMapType(mapClass, unknownType(), unknownType());
     }
@@ -1402,11 +1409,10 @@ protected JavaType _newSimpleType(Class<?> raw, TypeBindings bindings,
     }
 
     protected JavaType _unknownType() {
-        /* 15-Sep-2015, tatu: Prior to 2.7, we constructed new instance for each call.
-         *    This may have been due to potential mutability of the instance; but that
-         *    should not be issue any more, and creation is somewhat wasteful. So let's
-         *    try reusing singleton/flyweight instance.
-         */
+        // 15-Sep-2015, tatu: Prior to 2.7, we constructed new instance for each call.
+        //    This may have been due to potential mutability of the instance; but that
+        //    should not be issue any more, and creation is somewhat wasteful. So let's
+        //    try reusing singleton/fly-weight instance.
         return CORE_TYPE_OBJECT;
     }
 
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/BeanUtil.java b/src/main/java/com/fasterxml/jackson/databind/util/BeanUtil.java
index bb355cc670..0132c293b3 100644
--- a/src/main/java/com/fasterxml/jackson/databind/util/BeanUtil.java
+++ b/src/main/java/com/fasterxml/jackson/databind/util/BeanUtil.java
@@ -304,6 +304,10 @@ public static String checkUnsupportedType(JavaType type) {
             if (className.indexOf('.', 10) >= 0) {
                 return null;
             }
+            // [databind#4718]: Also don't worry about Exception type(s)
+            if (type.isTypeOrSubTypeOf(Throwable.class)) {
+                return null;
+            }
             typeName =  "Java 8 date/time";
             moduleName = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310";
         } else if (isJodaTimeClass(className)) {
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/JacksonCollectors.java b/src/main/java/com/fasterxml/jackson/databind/util/JacksonCollectors.java
new file mode 100644
index 0000000000..c6b47fc4e4
--- /dev/null
+++ b/src/main/java/com/fasterxml/jackson/databind/util/JacksonCollectors.java
@@ -0,0 +1,53 @@
+package com.fasterxml.jackson.databind.util;
+
+import java.util.stream.Collector;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeCreator;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+
+/**
+ * Utility class that provides custom {@link Collector} implementations to support Stream operations.
+ * <p>
+ * This class is not meant to be instantiated and serves only as a utility class.
+ * </p>
+ *
+ * @since 2.18
+ */
+public abstract class JacksonCollectors {
+    /**
+     * Creates a {@link Collector} that collects {@link JsonNode} elements into an {@link ArrayNode}.
+     * <p>
+     * This method uses a {@link JsonNodeFactory} to create an empty {@link ArrayNode} and then adds each
+     * {@link JsonNode} to it.
+     * </p>
+     *<p>
+     * Short-cut to
+     *{@code toArrayNode(JsonNodeFactory.instance}}
+     *
+     * @return a {@link Collector} that collects {@link JsonNode} elements into an {@link ArrayNode}
+     */
+    public static Collector<JsonNode, ArrayNode, ArrayNode> toArrayNode() {
+        return toArrayNode(JsonNodeFactory.instance);
+    }
+
+    /**
+     * Creates a {@link Collector} that collects {@link JsonNode} elements into an {@link ArrayNode}.
+     * <p>
+     * This method uses a {@link JsonNodeFactory} to create an empty {@link ArrayNode} and then adds each
+     * {@link JsonNode} to it.
+     * </p>
+     *
+     * @param nodeCreator Factory for constructing {@link ArrayNode} to contain nodes in
+     *
+     * @return a {@link Collector} that collects {@link JsonNode} elements into an {@link ArrayNode}
+     */
+    public static Collector<JsonNode, ArrayNode, ArrayNode> toArrayNode(JsonNodeCreator nodeCreator) {
+        return Collector.of(
+                nodeCreator::arrayNode, // supplier
+                ArrayNode::add, // accumulator
+                ArrayNode::addAll // combiner
+            );
+    }
+}
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/NamingStrategyImpls.java b/src/main/java/com/fasterxml/jackson/databind/util/NamingStrategyImpls.java
new file mode 100644
index 0000000000..6f241b3b15
--- /dev/null
+++ b/src/main/java/com/fasterxml/jackson/databind/util/NamingStrategyImpls.java
@@ -0,0 +1,157 @@
+package com.fasterxml.jackson.databind.util;
+
+/**
+ * Container for standard naming strategy implementations, specifically
+ * used by property naming strategies (see {@link com.fasterxml.jackson.databind.PropertyNamingStrategies})
+ * and enum naming strategies (see {@link com.fasterxml.jackson.databind.EnumNamingStrategies}).
+ */
+public enum NamingStrategyImpls {
+  /**
+   * beanName -> beanName
+   */
+  LOWER_CAMEL_CASE {
+    @Override
+    public String translate(String beanName) {
+      return beanName; // beanName is already in lower camel case
+    }
+  },
+
+  /**
+   * beanName -> BeanName
+   */
+  UPPER_CAMEL_CASE {
+    @Override
+    public String translate(String beanName) {
+      if (beanName == null || beanName.isEmpty()) {
+        return beanName; // garbage in, garbage out
+      }
+      // Replace first lower-case letter with upper-case equivalent
+      char c = beanName.charAt(0);
+      char uc = Character.toUpperCase(c);
+      if (c == uc) {
+        return beanName;
+      }
+      StringBuilder sb = new StringBuilder(beanName);
+      sb.setCharAt(0, uc);
+      return sb.toString();
+    }
+  },
+
+  /**
+   * beanName -> bean_name
+   */
+  SNAKE_CASE {
+    @Override
+    public String translate(String beanName) {
+      if (beanName == null) return beanName; // garbage in, garbage out
+      int length = beanName.length();
+      StringBuilder result = new StringBuilder(length * 2);
+      int resultLength = 0;
+      boolean wasPrevTranslated = false;
+      for (int i = 0; i < length; i++) {
+        char c = beanName.charAt(i);
+        if (i > 0 || c != '_') // skip first starting underscore
+        {
+          if (Character.isUpperCase(c)) {
+            if (!wasPrevTranslated && resultLength > 0 && result.charAt(resultLength - 1) != '_') {
+              result.append('_');
+              resultLength++;
+            }
+            c = Character.toLowerCase(c);
+            wasPrevTranslated = true;
+          } else {
+            wasPrevTranslated = false;
+          }
+          result.append(c);
+          resultLength++;
+        }
+      }
+      return resultLength > 0 ? result.toString() : beanName;
+    }
+  },
+
+  /**
+   * beanName -> BEAN_NAME
+   */
+  UPPER_SNAKE_CASE {
+    @Override
+    public String translate(String beanName) {
+      String output = SNAKE_CASE.translate(beanName);
+      if (output == null) {
+        return null;
+      }
+      return output.toUpperCase();
+    }
+  },
+
+  /**
+   * beanName -> beanname
+   */
+  LOWER_CASE {
+    @Override
+    public String translate(String beanName) {
+      if (beanName == null || beanName.isEmpty()) {
+        return beanName;
+      }
+      return beanName.toLowerCase();
+    }
+  },
+
+  /**
+   * beanName -> bean-name
+   */
+  KEBAB_CASE {
+    @Override
+    public String translate(String beanName) {
+      return translateLowerCaseWithSeparator(beanName, '-');
+    }
+  },
+
+  /**
+   * beanName -> bean.name
+   */
+  LOWER_DOT_CASE {
+    @Override
+    public String translate(String beanName) {
+      return translateLowerCaseWithSeparator(beanName, '.');
+    }
+  },
+  ;
+
+  public abstract String translate(final String beanName);
+
+  /**
+   * Helper method to share implementation between snake and dotted case.
+   */
+  static String translateLowerCaseWithSeparator(final String beanName, final char separator) {
+    if (beanName == null || beanName.isEmpty()) {
+      return beanName;
+    }
+
+    final int length = beanName.length();
+    final StringBuilder result = new StringBuilder(length + (length >> 1));
+    int upperCount = 0;
+    for (int i = 0; i < length; ++i) {
+      char ch = beanName.charAt(i);
+      char lc = Character.toLowerCase(ch);
+
+      if (lc == ch) { // lower-case letter means we can get new word
+        // but need to check for multi-letter upper-case (acronym), where assumption
+        // is that the last upper-case char is start of a new word
+        if (upperCount > 1) {
+          // so insert hyphen before the last character now
+          result.insert(result.length() - 1, separator);
+        }
+        upperCount = 0;
+      } else {
+        // Otherwise starts new word, unless beginning of string
+        if ((upperCount == 0) && (i > 0)) {
+          result.append(separator);
+        }
+        ++upperCount;
+      }
+      result.append(lc);
+    }
+    return result.toString();
+  }
+}
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java b/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java
index c5a0590c30..2ccb0b6d71 100644
--- a/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java
@@ -954,6 +954,27 @@ public void writeNumber(String encodedValue) throws IOException {
         _appendValue(JsonToken.VALUE_NUMBER_FLOAT, encodedValue);
     }
 
+    /**
+     * Write method that can be used for custom numeric types that can
+     * not be (easily?) converted to "standard" Java number types.
+     * Because numbers are not surrounded by double quotes, regular
+     * {@link #writeString} method can not be used; nor
+     * {@link #writeRaw} because that does not properly handle
+     * value separators needed in Array or Object contexts.
+     *
+     * @param encodedValue Textual (possibly formatted) number representation to write
+     * @param isInteger Whether value should be considered an integer
+     *
+     * @throws IOException if there is either an underlying I/O problem or encoding
+     *    issue at format layer
+     * @since 2.18
+     */
+    public void writeNumber(String encodedValue, boolean isInteger) throws IOException {
+        _appendValue(
+            isInteger ? JsonToken.VALUE_NUMBER_INT : JsonToken.VALUE_NUMBER_FLOAT,
+            encodedValue);
+    }
+
     private void writeLazyInteger(Object encodedValue) throws IOException {
         _appendValue(JsonToken.VALUE_NUMBER_INT, encodedValue);
     }
@@ -1853,8 +1874,7 @@ public float getFloatValue() throws IOException {
         @Override
         public int getIntValue() throws IOException
         {
-            Number n = (_currToken == JsonToken.VALUE_NUMBER_INT) ?
-                    ((Number) _currentObject()) : getNumberValue();
+            final Number n = getNumberValue(false);
             if ((n instanceof Integer) || _smallerThanInt(n)) {
                 return n.intValue();
             }
@@ -1863,8 +1883,7 @@ public int getIntValue() throws IOException
 
         @Override
         public long getLongValue() throws IOException {
-            Number n = (_currToken == JsonToken.VALUE_NUMBER_INT) ?
-                    ((Number) _currentObject()) : getNumberValue();
+            final Number n = getNumberValue(false);
             if ((n instanceof Long) || _smallerThanLong(n)) {
                 return n.longValue();
             }
diff --git a/src/test-jdk17/java/com/fasterxml/jackson/databind/records/RecordCreatorWithJsonValue4724Test.java b/src/test-jdk17/java/com/fasterxml/jackson/databind/records/RecordCreatorWithJsonValue4724Test.java
new file mode 100644
index 0000000000..350774d17a
--- /dev/null
+++ b/src/test-jdk17/java/com/fasterxml/jackson/databind/records/RecordCreatorWithJsonValue4724Test.java
@@ -0,0 +1,40 @@
+package com.fasterxml.jackson.databind.records;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+
+// [databind#4724] Deserialization behavior change with Java Records, JsonCreator and JsonValue between 2.17.2 => 2.18.0
+public class RecordCreatorWithJsonValue4724Test
+    extends DatabindTestUtil
+{
+    public record Something(String value) {
+        public Something {
+            if (value == null || value.isEmpty()) {
+                throw new IllegalArgumentException("Value cannot be null or empty");
+            }
+        }
+
+        // should be considered Delegating due to @JsonValue later on
+        @JsonCreator
+        public static Something of(String value) {
+            if (value.isEmpty()) {
+                return null;
+            }
+            return new Something(value);
+        }
+
+        @Override
+        @JsonValue
+        public String toString() {
+            return value;
+        }
+    }
+
+    @Test
+    void deserialization() throws Exception {
+        newJsonMapper().readValue("\"\"", Something.class);
+    }
+}
diff --git a/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/DuplicatePropertyDeserializationRecord4690Test.java b/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/DuplicatePropertyDeserializationRecord4690Test.java
new file mode 100644
index 0000000000..bc8c76658c
--- /dev/null
+++ b/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/DuplicatePropertyDeserializationRecord4690Test.java
@@ -0,0 +1,33 @@
+package com.fasterxml.jackson.databind.tofix;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+// [databind#4690] InvalidDefinitionException "No fallback setter/field defined for creator property"
+// when deserializing JSON with duplicated property to single-property Record
+public class DuplicatePropertyDeserializationRecord4690Test
+        extends DatabindTestUtil
+{
+
+    record MyRecord(String first) { }
+
+    private final ObjectMapper mapper = newJsonMapper();
+
+    @JacksonTestFailureExpected
+    @Test
+    void testDuplicatePropertyDeserialization() throws Exception {
+        final String json = a2q("{'first':'value','first':'value2'}");
+
+        MyRecord result = mapper.readValue(json, MyRecord.class);
+
+        assertNotNull(result);
+        assertEquals("value2", result.first());
+    }
+
+}
diff --git a/src/test-jdk17/java/com/fasterxml/jackson/databind/failing/RecordUpdate3079FailingTest.java b/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/RecordUpdate3079FailingTest.java
similarity index 86%
rename from src/test-jdk17/java/com/fasterxml/jackson/databind/failing/RecordUpdate3079FailingTest.java
rename to src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/RecordUpdate3079FailingTest.java
index de24fe331a..4c2767bac3 100644
--- a/src/test-jdk17/java/com/fasterxml/jackson/databind/failing/RecordUpdate3079FailingTest.java
+++ b/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/RecordUpdate3079FailingTest.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.Collections;
 
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.records.RecordUpdate3079Test;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -17,6 +18,7 @@ public class RecordUpdate3079FailingTest extends DatabindTestUtil
     private final ObjectMapper MAPPER = newJsonMapper();
 
     // [databind#3079]: Should be able to Record value directly
+    @JacksonTestFailureExpected
     @Test
     public void testDirectRecordUpdate() throws Exception
     {
diff --git a/src/test/java/com/fasterxml/jackson/databind/HandlerInstantiationTest.java b/src/test/java/com/fasterxml/jackson/databind/HandlerInstantiationTest.java
index 8e1296d348..e7fd7acc2e 100644
--- a/src/test/java/com/fasterxml/jackson/databind/HandlerInstantiationTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/HandlerInstantiationTest.java
@@ -18,7 +18,6 @@
 import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
 import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
 import com.fasterxml.jackson.databind.jsontype.impl.TypeIdResolverBase;
-import com.fasterxml.jackson.databind.type.TypeFactory;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -153,7 +152,7 @@ public void init(JavaType baseType) {
         public JavaType typeFromId(DatabindContext context, String id)
         {
             if (id.equals(_id)) {
-                return TypeFactory.defaultInstance().constructType(TypeIdBean.class);
+                return context.constructType(TypeIdBean.class);
             }
             return null;
         }
diff --git a/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java b/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
index 10db6504b7..e25bc4ae41 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
@@ -282,6 +282,7 @@ public void jsonMapperRebuildTest()
 
         JsonMapper m3 = m2.rebuild()
                 .propertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE)
+                .enumNamingStrategy(EnumNamingStrategies.CamelCaseStrategy.INSTANCE)
                 .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS)
                 .enable(EnumFeature.WRITE_ENUMS_TO_LOWERCASE)
                 .build();
diff --git a/src/test/java/com/fasterxml/jackson/databind/SerializeUsingJDKTest.java b/src/test/java/com/fasterxml/jackson/databind/SerializeUsingJDKTest.java
index 0ad3174095..0b1185c93c 100644
--- a/src/test/java/com/fasterxml/jackson/databind/SerializeUsingJDKTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/SerializeUsingJDKTest.java
@@ -223,7 +223,7 @@ public void testObjectMapper() throws Exception
     @Test
     public void testTypeFactory() throws Exception
     {
-        TypeFactory orig = TypeFactory.defaultInstance();
+        TypeFactory orig = defaultTypeFactory();
         JavaType t = orig.constructType(JavaType.class);
         assertNotNull(t);
 
diff --git a/src/test/java/com/fasterxml/jackson/databind/contextual/ContextualKeyTypesTest.java b/src/test/java/com/fasterxml/jackson/databind/contextual/ContextualKeyTypesTest.java
index cd606eae45..449f8d36f5 100644
--- a/src/test/java/com/fasterxml/jackson/databind/contextual/ContextualKeyTypesTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/contextual/ContextualKeyTypesTest.java
@@ -11,7 +11,7 @@
 import com.fasterxml.jackson.databind.deser.ContextualKeyDeserializer;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.fasterxml.jackson.databind.type.TypeFactory;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -20,7 +20,7 @@
  * Tests to ensure that we can do contextual key serializers and
  * deserializers as well as value ser/deser.
  */
-public class ContextualKeyTypesTest
+public class ContextualKeyTypesTest extends DatabindTestUtil
 {
     /*
     /**********************************************************
@@ -99,7 +99,7 @@ public void testSimpleKeySer() throws Exception
         mapper.registerModule(module);
         Map<String,Object> input = new HashMap<String,Object>();
         input.put("a", Integer.valueOf(3));
-        String json = mapper.writerFor(TypeFactory.defaultInstance().constructMapType(HashMap.class, String.class, Object.class))
+        String json = mapper.writerFor(defaultTypeFactory().constructMapType(HashMap.class, String.class, Object.class))
             .writeValueAsString(input);
         assertEquals("{\"prefix:a\":3}", json);
     }
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/AnySetterFieldWithCreator4639Test.java b/src/test/java/com/fasterxml/jackson/databind/deser/AnySetterFieldWithCreator4639Test.java
new file mode 100644
index 0000000000..0b628117dd
--- /dev/null
+++ b/src/test/java/com/fasterxml/jackson/databind/deser/AnySetterFieldWithCreator4639Test.java
@@ -0,0 +1,60 @@
+package com.fasterxml.jackson.databind.deser;
+
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+// [databind#4639] 2.18.1 : regression when using @JsonAnySetter outside of @JsonCreator
+public class AnySetterFieldWithCreator4639Test
+        extends DatabindTestUtil
+{
+
+    public static class Bean {
+        int b;
+        int d;
+
+        @JsonAnySetter
+        Map<String, ?> any;
+
+        @JsonCreator
+        public Bean(@JsonProperty("b") int b, @JsonProperty("d") int d) {
+            this.b = b;
+            this.d = d;
+        }
+    }
+
+    @Test
+    public void testJsonAnySetter()
+            throws Exception
+    {
+        String json = "{\"a\":1,\"b\":2,\"c\":3,\"d\":4,\"e\":5,\"f\":6}";
+
+        Bean bean = newJsonMapper().readValue(json, Bean.class);
+        assertEquals(2, bean.b);
+        assertEquals(4, bean.d);
+
+        // failed with:
+        // org.opentest4j.AssertionFailedError:
+        // Expected :{b=2, c=3, e=5, f=6}
+        // Actual   :{e=5, f=6}
+        assertEquals(mapOf("a", 1, "c", 3, "e", 5, "f", 6), bean.any);
+    }
+
+    private Map<String, Integer> mapOf(String a, int i, String b, int i1, String c, int i2, String d, int i3)
+    {
+        Map<String, Integer> map = new java.util.HashMap<>();
+        map.put(a, i);
+        map.put(b, i1);
+        map.put(c, i2);
+        map.put(d, i3);
+        return map;
+    }
+
+}
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/BeanDeserializerModifier4356Test.java b/src/test/java/com/fasterxml/jackson/databind/deser/BeanDeserializerModifier4356Test.java
index 51bea20533..39016ddf7c 100644
--- a/src/test/java/com/fasterxml/jackson/databind/deser/BeanDeserializerModifier4356Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/deser/BeanDeserializerModifier4356Test.java
@@ -12,9 +12,6 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 
 import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.BeanDeserializerBuilder;
-import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier;
-import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/CustomDeserializers4225NullCacheTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/CustomDeserializers4225NullCacheTest.java
index 6019c0f304..d62c6737f8 100644
--- a/src/test/java/com/fasterxml/jackson/databind/deser/CustomDeserializers4225NullCacheTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/deser/CustomDeserializers4225NullCacheTest.java
@@ -19,9 +19,9 @@
  */
 public class CustomDeserializers4225NullCacheTest extends DatabindTestUtil
 {
-    static class CustomListDeserializer extends JsonDeserializer<List<String>> {
-
-        private static int getNullValueInvocationCount = 0;
+    static class CustomListDeserializer extends JsonDeserializer<List<String>>
+    {
+        static int getNullValueInvocationCount = 0;
 
         @Override
         public List<String> deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JacksonException {
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/JacksonTypesDeserTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/JacksonTypesDeserTest.java
index 7f48b5f900..12f18d1cd8 100644
--- a/src/test/java/com/fasterxml/jackson/databind/deser/JacksonTypesDeserTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/deser/JacksonTypesDeserTest.java
@@ -59,7 +59,7 @@ public void testJsonLocationProps()
     @Test
     public void testJavaType() throws Exception
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         // first simple type:
         String json = MAPPER.writeValueAsString(tf.constructType(String.class));
         assertEquals(q(java.lang.String.class.getName()), json);
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/creators/SingletonDelegatingCreatorTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/creators/SingletonDelegatingCreatorTest.java
new file mode 100644
index 0000000000..669e0c4719
--- /dev/null
+++ b/src/test/java/com/fasterxml/jackson/databind/deser/creators/SingletonDelegatingCreatorTest.java
@@ -0,0 +1,78 @@
+package com.fasterxml.jackson.databind.deser.creators;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+// [databind#4688]
+public class SingletonDelegatingCreatorTest extends DatabindTestUtil
+{
+    static final class NoFieldSingletonWithDelegatingCreator {
+        static final NoFieldSingletonWithDelegatingCreator INSTANCE = new NoFieldSingletonWithDelegatingCreator();
+
+        private NoFieldSingletonWithDelegatingCreator() {}
+
+        @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+        static NoFieldSingletonWithDelegatingCreator of() {
+            return INSTANCE;
+        }
+    }
+
+    static final class NoFieldSingletonWithPropertiesCreator {
+        static final NoFieldSingletonWithPropertiesCreator INSTANCE = new NoFieldSingletonWithPropertiesCreator();
+
+        private NoFieldSingletonWithPropertiesCreator() {}
+
+        @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+        static NoFieldSingletonWithPropertiesCreator of() {
+            return INSTANCE;
+        }
+    }
+
+    static final class NoFieldSingletonWithDefaultCreator {
+        static final NoFieldSingletonWithDefaultCreator INSTANCE = new NoFieldSingletonWithDefaultCreator();
+
+        private NoFieldSingletonWithDefaultCreator() {}
+
+        @JsonCreator
+        static NoFieldSingletonWithDefaultCreator of() {
+            return INSTANCE;
+        }
+    }
+
+    /*
+    /**********************************************************************
+    /* Test methods
+    /**********************************************************************
+     */
+
+    private final ObjectMapper MAPPER = newJsonMapper();
+
+    @Test
+    public void testNoFieldSingletonWithDelegatingCreator() throws Exception
+    {
+        NoFieldSingletonWithDelegatingCreator deserialized = MAPPER.readValue("{}",
+                NoFieldSingletonWithDelegatingCreator.class);
+        assertSame(NoFieldSingletonWithDelegatingCreator.INSTANCE, deserialized);
+    }
+
+    @Test
+    public void testNoFieldSingletonWithPropertiesCreator() throws Exception
+    {
+        NoFieldSingletonWithPropertiesCreator deserialized = MAPPER.readValue("{}",
+                NoFieldSingletonWithPropertiesCreator.class);
+        assertSame(NoFieldSingletonWithPropertiesCreator.INSTANCE, deserialized);
+    }
+
+    @Test
+    public void testNoFieldSingletonWithDefaultCreator() throws Exception
+    {
+        NoFieldSingletonWithDefaultCreator deserialized = MAPPER.readValue("{}",
+                NoFieldSingletonWithDefaultCreator.class);
+        assertSame(NoFieldSingletonWithDefaultCreator.INSTANCE, deserialized);
+    }
+}
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/creators/ValueInstantiatorTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/creators/ValueInstantiatorTest.java
index 8e270036c2..0732c2d38e 100644
--- a/src/test/java/com/fasterxml/jackson/databind/deser/creators/ValueInstantiatorTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/deser/creators/ValueInstantiatorTest.java
@@ -251,7 +251,7 @@ static class MyDelegateMapInstantiator extends ValueInstantiator.Base
 
         @Override
         public JavaType getDelegateType(DeserializationConfig config) {
-            return TypeFactory.defaultInstance().constructType(Object.class);
+            return defaultTypeFactory().constructType(Object.class);
         }
 
         @Override
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/enums/EnumNamingDeserializationTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/enums/EnumNamingDeserializationTest.java
index f32932594a..eacae35e6e 100644
--- a/src/test/java/com/fasterxml/jackson/databind/deser/enums/EnumNamingDeserializationTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/deser/enums/EnumNamingDeserializationTest.java
@@ -15,17 +15,16 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-import static com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS;
 import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.*;
 
 public class EnumNamingDeserializationTest
 {
     private final ObjectMapper MAPPER = newJsonMapper();
     private final ObjectMapper MAPPER_CI = jsonMapperBuilder()
-            .enable(ACCEPT_CASE_INSENSITIVE_ENUMS)
+            .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS)
             .build();
 
-    @EnumNaming(EnumNamingStrategies.CamelCaseStrategy.class)
+    @EnumNaming(EnumNamingStrategies.LowerCamelCaseStrategy.class)
     static enum EnumFlavorA {
         PEANUT_BUTTER,
         SALTED_CARAMEL,
@@ -33,12 +32,12 @@ static enum EnumFlavorA {
         VANILLA;
     }
 
-    @EnumNaming(EnumNamingStrategies.CamelCaseStrategy.class)
+    @EnumNaming(EnumNamingStrategies.LowerCamelCaseStrategy.class)
     static enum EnumFlavorB {
         PEANUT_BUTTER,
     }
 
-    @EnumNaming(EnumNamingStrategies.CamelCaseStrategy.class)
+    @EnumNaming(EnumNamingStrategies.LowerCamelCaseStrategy.class)
     static enum EnumSauceC {
         KETCH_UP,
         MAYO_NEZZ;
@@ -50,14 +49,14 @@ static enum EnumSauceD {
         SRIRACHA_MAYO;
     }
 
-    @EnumNaming(EnumNamingStrategies.CamelCaseStrategy.class)
+    @EnumNaming(EnumNamingStrategies.LowerCamelCaseStrategy.class)
     static enum EnumFlavorE {
         _PEANUT_BUTTER,
         PEANUT__BUTTER,
         PEANUT_BUTTER
     }
 
-    @EnumNaming(EnumNamingStrategies.CamelCaseStrategy.class)
+    @EnumNaming(EnumNamingStrategies.LowerCamelCaseStrategy.class)
     static enum EnumFlavorF {
         PEANUT_BUTTER,
         @JsonProperty("caramel")
@@ -89,7 +88,7 @@ static enum BaseEnum {
         REAL_NAME
     }
 
-    @EnumNaming(EnumNamingStrategies.CamelCaseStrategy.class)
+    @EnumNaming(EnumNamingStrategies.LowerCamelCaseStrategy.class)
     static enum MixInEnum {
         REAL_NAME
     }
@@ -282,13 +281,26 @@ public void testEnumMixInDeserializationTest() throws Exception {
         ObjectMapper mapper = jsonMapperBuilder()
                 .addMixIn(BaseEnum.class, MixInEnum.class)
                 .build();
-        
+
         // serialization
         String ser = mapper.writeValueAsString(BaseEnum.REAL_NAME);
         assertEquals(q("realName"), ser);
-        
+
         // deserialization
         BaseEnum deser = mapper.readValue(q("realName"), BaseEnum.class);
         assertEquals(BaseEnum.REAL_NAME, deser);
     }
+
+    @Test
+    void testUseEnumMappingStrategySetInMapper() throws Exception {
+        ObjectMapper mapper = jsonMapperBuilder()
+                .enumNamingStrategy(EnumNamingStrategies.LowerCamelCaseStrategy.INSTANCE)
+                .build();
+
+        BaseEnum result = mapper.readValue(q("realName"), BaseEnum.class);
+        assertEquals(BaseEnum.REAL_NAME, result);
+
+        String resultString = mapper.writeValueAsString(result);
+        assertEquals(q("realName"), resultString);
+    }
 }
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKNumberDeserTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKNumberDeserTest.java
index 6ca6877092..c4a31b7239 100644
--- a/src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKNumberDeserTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKNumberDeserTest.java
@@ -386,4 +386,30 @@ public void testBigDecimalUnwrapped() throws Exception
         NestedBigDecimalHolder2784 result = mapper.readValue(JSON, NestedBigDecimalHolder2784.class);
         assertEquals(new BigDecimal("5.00"), result.holder.value);
     }
+
+    private final String BIG_DEC_STR;
+    {
+        StringBuilder sb = new StringBuilder("-1234.");
+        // Above 500 chars we get a problem:
+        for (int i = 520; --i >= 0; ) {
+            sb.append('0');
+        }
+        BIG_DEC_STR = sb.toString();
+    }
+    private final BigDecimal BIG_DEC = new BigDecimal(BIG_DEC_STR);
+
+    // [databind#4694]: decoded wrong by jackson-core/FDP for over 500 char numbers
+    @Test
+    public void bigDecimal4694FromString() throws Exception
+    {
+        assertEquals(BIG_DEC, MAPPER.readValue(BIG_DEC_STR, BigDecimal.class));
+    }
+
+    @Test
+    public void bigDecimal4694FromBytes() throws Exception
+    {
+        byte[] b = utf8Bytes(BIG_DEC_STR);
+        assertEquals(BIG_DEC, MAPPER.readValue(b, 0, b.length, BigDecimal.class));
+    }
+
 }
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/jdk/MapWithGenericValuesDeserTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/jdk/MapWithGenericValuesDeserTest.java
index b1001804b2..e1c1839c95 100644
--- a/src/test/java/com/fasterxml/jackson/databind/deser/jdk/MapWithGenericValuesDeserTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/deser/jdk/MapWithGenericValuesDeserTest.java
@@ -8,13 +8,14 @@
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @SuppressWarnings("serial")
-public class MapWithGenericValuesDeserTest
+public class MapWithGenericValuesDeserTest extends DatabindTestUtil
 {
     /*
     /**********************************************************
@@ -154,7 +155,7 @@ public void testKeyViaCtor() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper();
         Map<KeyTypeCtor,Integer> map = mapper.readValue("{\"a\":123}",
-                TypeFactory.defaultInstance().constructMapType(HashMap.class, KeyTypeCtor.class, Integer.class));
+                defaultTypeFactory().constructMapType(HashMap.class, KeyTypeCtor.class, Integer.class));
         assertEquals(1, map.size());
         Map.Entry<?,?> entry = map.entrySet().iterator().next();
         assertEquals(Integer.valueOf(123), entry.getValue());
@@ -168,7 +169,7 @@ public void testKeyViaFactory() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper();
         Map<KeyTypeCtor,Integer> map = mapper.readValue("{\"a\":123}",
-                TypeFactory.defaultInstance().constructMapType(HashMap.class, KeyTypeFactory.class, Integer.class));
+                defaultTypeFactory().constructMapType(HashMap.class, KeyTypeFactory.class, Integer.class));
         assertEquals(1, map.size());
         Map.Entry<?,?> entry = map.entrySet().iterator().next();
         assertEquals(Integer.valueOf(123), entry.getValue());
diff --git a/src/test/java/com/fasterxml/jackson/databind/exc/BasicExceptionTest.java b/src/test/java/com/fasterxml/jackson/databind/exc/BasicExceptionTest.java
index d018590dbf..80b96e8548 100644
--- a/src/test/java/com/fasterxml/jackson/databind/exc/BasicExceptionTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/exc/BasicExceptionTest.java
@@ -10,13 +10,11 @@
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
-import com.fasterxml.jackson.databind.type.TypeFactory;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.newJsonMapper;
-
-public class BasicExceptionTest
+public class BasicExceptionTest extends DatabindTestUtil
 {
     static class User {
         public String user;
@@ -32,7 +30,7 @@ static class Users {
     @Test
     public void testBadDefinition() throws Exception
     {
-        JavaType t = TypeFactory.defaultInstance().constructType(String.class);
+        JavaType t = defaultTypeFactory().constructType(String.class);
         JsonParser p = JSON_F.createParser("[]");
         InvalidDefinitionException e = new InvalidDefinitionException(p,
                "Testing", t);
diff --git a/src/test/java/com/fasterxml/jackson/databind/ext/MiscJavaXMLTypesReadWriteTest.java b/src/test/java/com/fasterxml/jackson/databind/ext/MiscJavaXMLTypesReadWriteTest.java
index 118c14edff..130cd38ca2 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ext/MiscJavaXMLTypesReadWriteTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ext/MiscJavaXMLTypesReadWriteTest.java
@@ -102,7 +102,7 @@ private String removeZ(String dateStr) {
     public void testDeserializerLoading()
     {
         CoreXMLDeserializers sers = new CoreXMLDeserializers();
-        TypeFactory f = TypeFactory.defaultInstance();
+        TypeFactory f = defaultTypeFactory();
         sers.findBeanDeserializer(f.constructType(Duration.class), null, null);
         sers.findBeanDeserializer(f.constructType(XMLGregorianCalendar.class), null, null);
         sers.findBeanDeserializer(f.constructType(QName.class), null, null);
diff --git a/src/test/java/com/fasterxml/jackson/databind/interop/DateJava8FallbacksTest.java b/src/test/java/com/fasterxml/jackson/databind/interop/DateJava8FallbacksTest.java
index 615b762f45..3aa2a5d261 100644
--- a/src/test/java/com/fasterxml/jackson/databind/interop/DateJava8FallbacksTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/interop/DateJava8FallbacksTest.java
@@ -1,5 +1,6 @@
 package com.fasterxml.jackson.databind.interop;
 
+import java.time.DateTimeException;
 import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
@@ -84,4 +85,19 @@ public void testAllowAsEmbedded() throws Exception
             }
         }
     }
+
+    // [databind#4718]: should not block serialization of `DateTimeException`
+    @Test
+    public void testAllowExceptionSer() throws Exception {
+        String json = MAPPER.writeValueAsString(new DateTimeException("Test!"));
+        assertTrue(MAPPER.readTree(json).isObject());
+    }
+
+    // [databind#4718]: should not block deserialization of `DateTimeException`
+    @Test
+    public void testAllowExceptionDeser() throws Exception {
+        DateTimeException exc = MAPPER.readValue("{\"message\":\"test!\"}",
+                DateTimeException.class);
+        assertNotNull(exc);
+    }
 }
diff --git a/src/test/java/com/fasterxml/jackson/databind/introspect/EnumNamingStrategiesTest.java b/src/test/java/com/fasterxml/jackson/databind/introspect/EnumNamingStrategiesTest.java
index e810f34eb4..c5f69c3b9f 100644
--- a/src/test/java/com/fasterxml/jackson/databind/introspect/EnumNamingStrategiesTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/introspect/EnumNamingStrategiesTest.java
@@ -1,13 +1,14 @@
 package com.fasterxml.jackson.databind.introspect;
 
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.jupiter.api.Test;
-
-import com.fasterxml.jackson.databind.EnumNamingStrategies;
+import com.fasterxml.jackson.databind.EnumNamingStrategy;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
+import java.util.stream.Stream;
+
+import static com.fasterxml.jackson.databind.EnumNamingStrategies.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
@@ -17,120 +18,126 @@
  *
  * @since 2.15
  */
-public class EnumNamingStrategiesTest extends DatabindTestUtil {
-
+class EnumNamingStrategiesTest extends DatabindTestUtil {
     /**
-     * Test casess for {@link com.fasterxml.jackson.databind.EnumNamingStrategies.CamelCaseStrategy}.
+     * Test cases for {@link com.fasterxml.jackson.databind.EnumNamingStrategies}.
      *
-     * <p>
-     * Each <code>Object[]</code> element is composed of <code>{input, expectedOutput}</code>.
-     *
-     * @since 2.15
+     * @since 2.19
      */
-    final static List<String[]> CAMEL_CASE_NAME_TRANSLATIONS = Arrays.asList(new String[][]{
-            // Empty values
-            {null, null},
-            {"", ""},
+    private static Stream<Arguments> enumNameConversionTestCases() {
+        return Stream.of(
+                // Empty values
+                Arguments.of(LOWER_CAMEL_CASE, null, null),
+                Arguments.of(UPPER_CAMEL_CASE, null, null),
+                Arguments.of(SNAKE_CASE, null, null),
+                Arguments.of(UPPER_SNAKE_CASE, null, null),
+                Arguments.of(LOWER_CASE, null, null),
+                Arguments.of(KEBAB_CASE, null, null),
+                Arguments.of(LOWER_DOT_CASE, null, null),
+                Arguments.of(LOWER_CAMEL_CASE, "", ""),
 
-            // input values with no underscores
-            {"a", "a"},
-            {"abc", "abc"},
-            {"A", "a"},
-            {"A1", "a1"},
-            {"1A", "1a"},
-            {"ABC", "abc"},
-            {"User", "user"},
-            {"Results", "results"},
-            {"WWW", "www"},
-            {"USER", "user"},
-            {"userName", "username"},
-            {"someURI", "someuri"},
-            {"someURIs", "someuris"},
-            {"theWWW", "thewww"},
-            {"uId", "uid"},
-            {"usId", "usid"},
-            {"UserName", "username"},
-            {"user", "user"},
-            {"xCoordinate", "xcoordinate"},
+                // input values with no underscores
+                Arguments.of(LOWER_CAMEL_CASE, "a", "a"),
+                Arguments.of(LOWER_CAMEL_CASE, "abc", "abc"),
+                Arguments.of(LOWER_CAMEL_CASE, "A", "a"),
+                Arguments.of(LOWER_CAMEL_CASE, "A1", "a1"),
+                Arguments.of(LOWER_CAMEL_CASE, "1A", "1a"),
+                Arguments.of(LOWER_CAMEL_CASE, "ABC", "abc"),
+                Arguments.of(LOWER_CAMEL_CASE, "User", "user"),
+                Arguments.of(LOWER_CAMEL_CASE, "Results", "results"),
+                Arguments.of(LOWER_CAMEL_CASE, "WWW", "www"),
+                Arguments.of(LOWER_CAMEL_CASE, "USER", "user"),
+                Arguments.of(LOWER_CAMEL_CASE, "userName", "username"),
+                Arguments.of(LOWER_CAMEL_CASE, "someURI", "someuri"),
+                Arguments.of(LOWER_CAMEL_CASE, "someURIs", "someuris"),
+                Arguments.of(LOWER_CAMEL_CASE, "theWWW", "thewww"),
+                Arguments.of(LOWER_CAMEL_CASE, "uId", "uid"),
+                Arguments.of(LOWER_CAMEL_CASE, "usId", "usid"),
+                Arguments.of(LOWER_CAMEL_CASE, "UserName", "username"),
+                Arguments.of(KEBAB_CASE, "UserName", "username"),
+                Arguments.of(LOWER_CAMEL_CASE, "user", "user"),
+                Arguments.of(LOWER_CAMEL_CASE, "xCoordinate", "xcoordinate"),
 
-            // input values with single underscores
-            {"a_", "a"},
-            {"_A", "A"},
-            {"_a", "A"},
-            {"a_A", "aA"},
-            {"a_a", "aA"},
-            {"A_A", "aA"},
-            {"A_a", "aA"},
-            {"BARS_", "bars"},
-            {"BARS", "bars"},
-            {"THE_WWW", "theWww"},
-            {"U_ID", "uId"},
-            {"US_ID", "usId"},
-            {"X_COORDINATE", "xCoordinate"},
+                // input values with single underscores
+                Arguments.of(LOWER_CAMEL_CASE, "a_", "a"),
+                Arguments.of(LOWER_CAMEL_CASE, "_A", "A"),
+                Arguments.of(LOWER_CAMEL_CASE, "_a", "A"),
+                Arguments.of(LOWER_CAMEL_CASE, "a_A", "aA"),
+                Arguments.of(LOWER_CAMEL_CASE, "a_a", "aA"),
+                Arguments.of(LOWER_CAMEL_CASE, "A_A", "aA"),
+                Arguments.of(LOWER_CAMEL_CASE, "A_a", "aA"),
+                Arguments.of(LOWER_CAMEL_CASE, "BARS_", "bars"),
+                Arguments.of(LOWER_CAMEL_CASE, "BARS", "bars"),
+                Arguments.of(LOWER_CAMEL_CASE, "THE_WWW", "theWww"),
+                Arguments.of(LOWER_CAMEL_CASE, "U_ID", "uId"),
+                Arguments.of(LOWER_CAMEL_CASE, "US_ID", "usId"),
+                Arguments.of(LOWER_CAMEL_CASE, "X_COORDINATE", "xCoordinate"),
 
-            // heavy "username" example
-            {"USERNAME_", "username"},
-            {"_User_Name", "UserName"},
-            {"_UserName", "Username"},
-            {"_Username", "Username"},
-            {"_user_name", "UserName"},
-            {"_USERNAME", "Username"},
-            {"__USERNAME", "Username"},
-            {"__Username", "Username"},
-            {"__username", "Username"},
-            {"USER______NAME", "userName"},
-            {"USER_NAME", "userName"},
-            {"USER__NAME", "userName"},
-            {"USER_NAME_", "userName"},
-            {"User__Name", "userName"},
-            {"USER_NAME_S", "userNameS"},
-            {"_user_name_s", "UserNameS"},
-            {"USER_NAME_S", "userNameS"},
-            {"user__name", "userName"},
-            {"user_name", "userName"},
-            {"USERNAME", "username"},
-            {"username", "username"},
-            {"User_Name", "userName"},
-            {"User_Name_", "userName"},
-            {"User_Name_", "userName"},
-            {"User_Name__", "userName"},
-            {"user_name_", "userName"},
-            {"user_name__", "userName"},
+                // heavy "username" example
+                Arguments.of(LOWER_CAMEL_CASE, "USERNAME_", "username"),
+                Arguments.of(LOWER_CAMEL_CASE, "_User_Name", "UserName"),
+                Arguments.of(LOWER_CAMEL_CASE, "_UserName", "Username"),
+                Arguments.of(LOWER_CAMEL_CASE, "_Username", "Username"),
+                Arguments.of(LOWER_CAMEL_CASE, "_user_name", "UserName"),
+                Arguments.of(LOWER_CAMEL_CASE, "_USERNAME", "Username"),
+                Arguments.of(LOWER_CAMEL_CASE, "__USERNAME", "Username"),
+                Arguments.of(LOWER_CAMEL_CASE, "__Username", "Username"),
+                Arguments.of(LOWER_CAMEL_CASE, "__username", "Username"),
+                Arguments.of(LOWER_CAMEL_CASE, "USER______NAME", "userName"),
+                Arguments.of(LOWER_CAMEL_CASE, "USER_NAME", "userName"),
+                Arguments.of(UPPER_CAMEL_CASE, "USER_NAME", "UserName"),
+                Arguments.of(SNAKE_CASE, "USER_NAME", "user_name"),
+                Arguments.of(UPPER_SNAKE_CASE, "USER_NAME", "USER_NAME"),
+                Arguments.of(LOWER_CASE, "USER_NAME", "username"),
+                Arguments.of(KEBAB_CASE, "USER_NAME", "user-name"),
+                Arguments.of(LOWER_DOT_CASE, "USER_NAME", "user.name"),
+                Arguments.of(LOWER_CAMEL_CASE, "USER__NAME", "userName"),
+                Arguments.of(LOWER_CAMEL_CASE, "USER_NAME_", "userName"),
+                Arguments.of(LOWER_CAMEL_CASE, "User__Name", "userName"),
+                Arguments.of(LOWER_CAMEL_CASE, "USER_NAME_S", "userNameS"),
+                Arguments.of(LOWER_CAMEL_CASE, "_user_name_s", "UserNameS"),
+                Arguments.of(LOWER_CAMEL_CASE, "USER_NAME_S", "userNameS"),
+                Arguments.of(LOWER_CAMEL_CASE, "user__name", "userName"),
+                Arguments.of(LOWER_CAMEL_CASE, "user_name", "userName"),
+                Arguments.of(LOWER_CAMEL_CASE, "USERNAME", "username"),
+                Arguments.of(LOWER_CAMEL_CASE, "username", "username"),
+                Arguments.of(LOWER_CAMEL_CASE, "User_Name", "userName"),
+                Arguments.of(LOWER_CAMEL_CASE, "User_Name_", "userName"),
+                Arguments.of(LOWER_CAMEL_CASE, "User_Name_", "userName"),
+                Arguments.of(LOWER_CAMEL_CASE, "User_Name__", "userName"),
+                Arguments.of(UPPER_SNAKE_CASE, "User_Name__", "USER_NAME"),
+                Arguments.of(LOWER_CAMEL_CASE, "user_name_", "userName"),
+                Arguments.of(LOWER_CAMEL_CASE, "user_name__", "userName"),
 
-            // additional variations
-            {"a$a", "a$a"},
-            {"A$A", "a$a"},
-            {"a_$", "a$"},
-            {"a$", "a$"},
-            {"a1", "a1"},
-            {"$", "$"},
-            {"A$", "a$"},
-            {"1", "1"},
-            {"$_A", "$A"},
-            {"$_a", "$A"},
-            {"1_A", "1A"},
-            {"1a", "1a"},
-            {"A_$", "a$"},
-            {"_123_41", "12341"},
-    });
+                // additional variations
+                Arguments.of(LOWER_CAMEL_CASE, "a$a", "a$a"),
+                Arguments.of(LOWER_CAMEL_CASE, "A$A", "a$a"),
+                Arguments.of(LOWER_CAMEL_CASE, "a_$", "a$"),
+                Arguments.of(LOWER_CAMEL_CASE, "a$", "a$"),
+                Arguments.of(LOWER_CAMEL_CASE, "a1", "a1"),
+                Arguments.of(LOWER_CAMEL_CASE, "$", "$"),
+                Arguments.of(LOWER_CAMEL_CASE, "A$", "a$"),
+                Arguments.of(LOWER_CAMEL_CASE, "1", "1"),
+                Arguments.of(LOWER_CAMEL_CASE, "$_A", "$A"),
+                Arguments.of(LOWER_CAMEL_CASE, "$_a", "$A"),
+                Arguments.of(LOWER_CAMEL_CASE, "1_A", "1A"),
+                Arguments.of(LOWER_CAMEL_CASE, "1a", "1a"),
+                Arguments.of(LOWER_CAMEL_CASE, "A_$", "a$"),
+                Arguments.of(LOWER_CAMEL_CASE, "_123_41", "12341")
+        );
+    }
 
     /**
-     * Unit test to verify the implementation of
-     * {@link com.fasterxml.jackson.databind.EnumNamingStrategies.CamelCaseStrategy#convertEnumToExternalName(String)}
+     * Unit test to verify the implementations of
+     * {@link com.fasterxml.jackson.databind.EnumNamingStrategy#convertEnumToExternalName(String)}
      * without the context of an ObjectMapper.
      *
-     * @since 2.15
+     * @since 2.19
      */
-    @Test
-    public void testCamelCaseStrategyStandAlone() {
-        for (String[] pair : CAMEL_CASE_NAME_TRANSLATIONS) {
-            final String input = pair[0];
-            final String expected = pair[1];
-
-            String actual = EnumNamingStrategies.CamelCaseStrategy.INSTANCE
-                    .convertEnumToExternalName(input);
-
-            assertEquals(expected, actual);
-        }
+    @ParameterizedTest
+    @MethodSource("enumNameConversionTestCases")
+    void testEnumNameConversions(EnumNamingStrategy strategy, String input, String output) {
+        String actual = strategy.convertEnumToExternalName(input);
+        assertEquals(output, actual);
     }
 }
diff --git a/src/test/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospectorTest.java b/src/test/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospectorTest.java
index 253aa4fefd..14927f9a48 100644
--- a/src/test/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospectorTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospectorTest.java
@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
 import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
-import com.fasterxml.jackson.databind.type.TypeFactory;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -204,7 +203,7 @@ public void testJsonTypeResolver() throws Exception
         JacksonAnnotationIntrospector ai = new JacksonAnnotationIntrospector();
         AnnotatedClass ac = AnnotatedClassResolver.resolveWithoutSuperTypes(mapper.getSerializationConfig(),
                 TypeResolverBean.class);
-        JavaType baseType = TypeFactory.defaultInstance().constructType(TypeResolverBean.class);
+        JavaType baseType = defaultTypeFactory().constructType(TypeResolverBean.class);
         TypeResolverBuilder<?> rb = ai.findTypeResolver(mapper.getDeserializationConfig(), ac, baseType);
         assertNotNull(rb);
         assertSame(DummyBuilder.class, rb.getClass());
diff --git a/src/test/java/com/fasterxml/jackson/databind/introspect/MethodGenericTypeResolverTest.java b/src/test/java/com/fasterxml/jackson/databind/introspect/MethodGenericTypeResolverTest.java
index 951910e398..b5008a878e 100644
--- a/src/test/java/com/fasterxml/jackson/databind/introspect/MethodGenericTypeResolverTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/introspect/MethodGenericTypeResolverTest.java
@@ -5,11 +5,12 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+
 import com.fasterxml.jackson.core.type.TypeReference;
+
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 import com.fasterxml.jackson.databind.type.TypeBindings;
-import com.fasterxml.jackson.databind.type.TypeFactory;
 
 import org.junit.jupiter.api.Test;
 
@@ -18,7 +19,7 @@
 public class MethodGenericTypeResolverTest extends DatabindTestUtil {
 
     private static final TypeResolutionContext EMPTY_CONTEXT =
-            new TypeResolutionContext.Empty(TypeFactory.defaultInstance());
+            new TypeResolutionContext.Empty(defaultTypeFactory());
 
     public static <T> AtomicReference<T> simple(T input) {
         throw new UnsupportedOperationException();
diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/CustomTypeIdResolverTest.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/CustomTypeIdResolverTest.java
index e4219a69f2..11b25c78b9 100644
--- a/src/test/java/com/fasterxml/jackson/databind/jsontype/CustomTypeIdResolverTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/CustomTypeIdResolverTest.java
@@ -12,7 +12,6 @@
 import com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver;
 import com.fasterxml.jackson.databind.jsontype.impl.TypeIdResolverBase;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
-import com.fasterxml.jackson.databind.type.TypeFactory;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -98,7 +97,7 @@ public void init(JavaType baseType) { }
         public JavaType typeFromId(DatabindContext context, String id)
         {
             if ("*".equals(id)) {
-                return TypeFactory.defaultInstance().constructType(subType);
+                return context.constructType(subType);
             }
             return null;
         }
diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/TestGenericListSerialization.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/TestGenericListSerialization.java
index 4c47c1aff4..48e0206a68 100644
--- a/src/test/java/com/fasterxml/jackson/databind/jsontype/TestGenericListSerialization.java
+++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/TestGenericListSerialization.java
@@ -64,7 +64,7 @@ public void testSubTypesFor356() throws Exception
                 .configure(MapperFeature.USE_STATIC_TYPING, true)
                 .build();
 
-        JavaType rootType = TypeFactory.defaultInstance().constructType(new TypeReference<JSONResponse<List<Parent>>>() { });
+        JavaType rootType = defaultTypeFactory().constructType(new TypeReference<JSONResponse<List<Parent>>>() { });
         byte[] json = mapper.writerFor(rootType).writeValueAsBytes(input);
 
         JSONResponse<List<Parent>> out = mapper.readValue(json, 0, json.length, rootType);
diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/TestPolymorphicDeduction.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/TestPolymorphicDeduction.java
index e29020d781..e746671c47 100644
--- a/src/test/java/com/fasterxml/jackson/databind/jsontype/TestPolymorphicDeduction.java
+++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/TestPolymorphicDeduction.java
@@ -185,7 +185,7 @@ public void testContainedInferenceOfEmptySubtype() throws Exception {
 
   @Test
   public void testListInference() throws Exception {
-    JavaType listOfCats = TypeFactory.defaultInstance().constructParametricType(List.class, Cat.class);
+    JavaType listOfCats = defaultTypeFactory().constructParametricType(List.class, Cat.class);
     List<Cat> boxes = MAPPER.readValue(arrayOfCatsJson, listOfCats);
     assertTrue(boxes.get(0) instanceof LiveCat);
     assertTrue(boxes.get(1) instanceof DeadCat);
@@ -193,7 +193,7 @@ public void testListInference() throws Exception {
 
   @Test
   public void testMapInference() throws Exception {
-    JavaType mapOfCats = TypeFactory.defaultInstance().constructParametricType(Map.class, String.class, Cat.class);
+    JavaType mapOfCats = defaultTypeFactory().constructParametricType(Map.class, String.class, Cat.class);
     Map<String, Cat> map = MAPPER.readValue(mapOfCatsJson, mapOfCats);
     assertEquals(1, map.size());
     assertTrue(map.entrySet().iterator().next().getValue() instanceof LiveCat);
@@ -281,7 +281,7 @@ public void testDefaultImpl() throws Exception {
   @Test
   public void testSimpleSerialization() throws Exception {
     // Given:
-    JavaType listOfCats = TypeFactory.defaultInstance().constructParametricType(List.class, Cat.class);
+    JavaType listOfCats = defaultTypeFactory().constructParametricType(List.class, Cat.class);
     List<Cat> list = MAPPER.readValue(arrayOfCatsJson, listOfCats);
     Cat cat = list.get(0);
     // When:
@@ -293,7 +293,7 @@ public void testSimpleSerialization() throws Exception {
   @Test
   public void testListSerialization() throws Exception {
     // Given:
-    JavaType listOfCats = TypeFactory.defaultInstance().constructParametricType(List.class, Cat.class);
+    JavaType listOfCats = defaultTypeFactory().constructParametricType(List.class, Cat.class);
     List<Cat> list = MAPPER.readValue(arrayOfCatsJson, listOfCats);
     // When:
     String json = MAPPER.writeValueAsString(list);
diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/TestTypeNames.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/TestTypeNames.java
index ea04d62ca4..05a42e157a 100644
--- a/src/test/java/com/fasterxml/jackson/databind/jsontype/TestTypeNames.java
+++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/TestTypeNames.java
@@ -91,7 +91,7 @@ public void testRoundTrip() throws Exception
         };
         String json = MAPPER.writeValueAsString(input);
         List<Animal> output = MAPPER.readValue(json,
-                TypeFactory.defaultInstance().constructCollectionType(ArrayList.class, Animal.class));
+                defaultTypeFactory().constructCollectionType(ArrayList.class, Animal.class));
         assertEquals(input.length, output.size());
         for (int i = 0, len = input.length; i < len; ++i) {
             assertEquals(input[i], output.get(i), "Entry #"+i+" differs, input = '"+json+"'");
diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/TestTypedDeserialization.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/TestTypedDeserialization.java
index 744df051fb..2a8f5590d9 100644
--- a/src/test/java/com/fasterxml/jackson/databind/jsontype/TestTypedDeserialization.java
+++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/TestTypedDeserialization.java
@@ -220,7 +220,7 @@ public void testListAsArray() throws Exception
             +asJSONObjectValueString(m, "@classy", Fish.class.getName())
             +", null\n]";
 
-        JavaType expType = TypeFactory.defaultInstance().constructCollectionType(ArrayList.class, Animal.class);
+        JavaType expType = defaultTypeFactory().constructCollectionType(ArrayList.class, Animal.class);
         List<Animal> animals = m.readValue(JSON, expType);
         assertNotNull(animals);
         assertEquals(4, animals.size());
diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/deftyping/TestDefaultForMaps.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/deftyping/TestDefaultForMaps.java
index 1a81827150..c64cf1ae47 100644
--- a/src/test/java/com/fasterxml/jackson/databind/jsontype/deftyping/TestDefaultForMaps.java
+++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/deftyping/TestDefaultForMaps.java
@@ -125,7 +125,7 @@ protected TypeNameIdResolver createTypeNameIdResolver(boolean forSerialization)
         subtypes.add(new NamedType(HashMap.class, "HMap"));
         ObjectMapper mapper = new ObjectMapper();
         return TypeNameIdResolver.construct(mapper.getDeserializationConfig(),
-                TypeFactory.defaultInstance().constructType(Object.class), subtypes, forSerialization, !forSerialization);
+                defaultTypeFactory().constructType(Object.class), subtypes, forSerialization, !forSerialization);
     }
 
     @Test
diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/jdk/TypedArrayDeserTest.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/jdk/TypedArrayDeserTest.java
index bbe86a23e9..cb2a30407b 100644
--- a/src/test/java/com/fasterxml/jackson/databind/jsontype/jdk/TypedArrayDeserTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/jdk/TypedArrayDeserTest.java
@@ -56,7 +56,7 @@ public void testIntList() throws Exception
         ObjectMapper m = new ObjectMapper();
         // uses WRAPPER_OBJECT inclusion
         String JSON = "{\""+TypedListAsWrapper.class.getName()+"\":[4,5, 6]}";
-        JavaType type = TypeFactory.defaultInstance().constructCollectionType(TypedListAsWrapper.class, Integer.class);
+        JavaType type = defaultTypeFactory().constructCollectionType(TypedListAsWrapper.class, Integer.class);
         TypedListAsWrapper<Integer> result = m.readValue(JSON, type);
         assertNotNull(result);
         assertEquals(3, result.size());
@@ -76,7 +76,7 @@ public void testBooleanListAsProp() throws Exception
         ObjectMapper m = new ObjectMapper();
         // tries to use PROPERTY inclusion; but for ARRAYS (and scalars) will become ARRAY_WRAPPER
         String JSON = "[\""+TypedListAsProp.class.getName()+"\",[true, false]]";
-        JavaType type = TypeFactory.defaultInstance().constructCollectionType(TypedListAsProp.class, Boolean.class);
+        JavaType type = defaultTypeFactory().constructCollectionType(TypedListAsProp.class, Boolean.class);
         TypedListAsProp<Object> result = m.readValue(JSON, type);
         assertNotNull(result);
         assertEquals(2, result.size());
@@ -91,7 +91,7 @@ public void testLongListAsWrapper() throws Exception
         // uses OBJECT_ARRAY, works just fine
 
         String JSON = "{\""+TypedListAsWrapper.class.getName()+"\":[1, 3]}";
-        JavaType type = TypeFactory.defaultInstance().constructCollectionType(TypedListAsWrapper.class, Long.class);
+        JavaType type = defaultTypeFactory().constructCollectionType(TypedListAsWrapper.class, Long.class);
         TypedListAsWrapper<Object> result = m.readValue(JSON, type);
         assertNotNull(result);
         assertEquals(2, result.size());
diff --git a/src/test/java/com/fasterxml/jackson/databind/module/TestTypeModifiers.java b/src/test/java/com/fasterxml/jackson/databind/module/TestTypeModifiers.java
index 65fa0c7749..5ad90148af 100644
--- a/src/test/java/com/fasterxml/jackson/databind/module/TestTypeModifiers.java
+++ b/src/test/java/com/fasterxml/jackson/databind/module/TestTypeModifiers.java
@@ -216,7 +216,7 @@ public JavaType modifyType(JavaType type, Type jdkType, TypeBindings bindings, T
      */
 
     private final ObjectMapper MAPPER_WITH_MODIFIER = JsonMapper.builder()
-            .typeFactory(TypeFactory.defaultInstance().withModifier(new MyTypeModifier()))
+            .typeFactory(defaultTypeFactory().withModifier(new MyTypeModifier()))
             .build();
 
     /**
diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/TestRootType.java b/src/test/java/com/fasterxml/jackson/databind/ser/TestRootType.java
index 4b10e6a7ca..65a4c69aeb 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ser/TestRootType.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ser/TestRootType.java
@@ -167,7 +167,7 @@ public void testIncompatibleRootType() throws Exception
     public void testJackson398() throws Exception
     {
         ObjectMapper mapper = newJsonMapper();
-        JavaType collectionType = TypeFactory.defaultInstance().constructCollectionType(ArrayList.class, BaseClass398.class);
+        JavaType collectionType = defaultTypeFactory().constructCollectionType(ArrayList.class, BaseClass398.class);
         List<TestClass398> typedList = new ArrayList<TestClass398>();
         typedList.add(new TestClass398());
 
diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/filter/JsonInclude1327Test.java b/src/test/java/com/fasterxml/jackson/databind/ser/filter/JsonInclude1327Test.java
deleted file mode 100644
index 438c188fef..0000000000
--- a/src/test/java/com/fasterxml/jackson/databind/ser/filter/JsonInclude1327Test.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.fasterxml.jackson.databind.ser.filter;
-
-import java.util.*;
-
-import org.junit.jupiter.api.Test;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * Unit tests for checking that alternative settings for
- * {@link JsonSerialize#include} annotation property work
- * as expected.
- */
-public class JsonInclude1327Test
-    extends DatabindTestUtil
-{
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    static class Issue1327BeanEmpty {
-        public List<String> myList = new ArrayList<String>();
-    }
-
-    static class Issue1327BeanAlways {
-        @JsonInclude(JsonInclude.Include.ALWAYS)
-        public List<String> myList = new ArrayList<String>();
-    }
-
-    /*
-    /**********************************************************
-    /* Unit tests
-    /**********************************************************
-     */
-
-    // for [databind#1327]
-    @Test
-    public void testClassDefaultsForEmpty() throws Exception {
-        ObjectMapper om = new ObjectMapper();
-        om.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-
-        final String jsonString = om.writeValueAsString(new Issue1327BeanEmpty());
-
-        if (jsonString.contains("myList")) {
-            fail("Should not contain `myList`: "+jsonString);
-        }
-    }
-
-    @Test
-    public void testClassDefaultsForAlways() throws Exception {
-        ObjectMapper om = new ObjectMapper();
-        om.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
-
-        final String jsonString = om.writeValueAsString(new Issue1327BeanAlways());
-
-        if (!jsonString.contains("myList")) {
-            fail("Should contain `myList` with Include.ALWAYS: "+jsonString);
-        }
-    }
-}
diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/filter/JsonIncludeTest.java b/src/test/java/com/fasterxml/jackson/databind/ser/filter/JsonIncludeTest.java
index d524d3dffd..ae54526525 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ser/filter/JsonIncludeTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ser/filter/JsonIncludeTest.java
@@ -1,6 +1,5 @@
 package com.fasterxml.jackson.databind.ser.filter;
 
-import java.io.IOException;
 import java.util.*;
 
 import org.junit.jupiter.api.Test;
@@ -105,6 +104,12 @@ public DefaultIntBean(int i1, Integer i2) {
         }
     }
 
+    // [databind#4741]
+    @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+    static class NonDefaultBean4741 {
+        public String value = null;
+    }
+
     static class NonEmptyString {
         @JsonInclude(JsonInclude.Include.NON_EMPTY)
         public String value;
@@ -154,8 +159,19 @@ static class NonDefaultCalendar extends NonDefault<Calendar> {
         public NonDefaultCalendar(Calendar v) { super(v); }
     }
 
-    // [databind#1351]
+    // [databind#1327]
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    static class Issue1327BeanEmpty {
+        public List<String> myList = new ArrayList<String>();
+    }
+
+    // [databind#1327]
+    static class Issue1327BeanAlways {
+        @JsonInclude(JsonInclude.Include.ALWAYS)
+        public List<String> myList = new ArrayList<String>();
+    }
 
+    // [databind#1351]
     static class Issue1351Bean
     {
         public final String first;
@@ -208,7 +224,7 @@ public void setStr(String str) {
     final private ObjectMapper MAPPER = newJsonMapper();
 
     @Test
-    public void testGlobal() throws IOException
+    public void testGlobal() throws Exception
     {
         Map<String,Object> result = writeAndMap(MAPPER, new SimpleBean());
         assertEquals(2, result.size());
@@ -218,7 +234,7 @@ public void testGlobal() throws IOException
     }
 
     @Test
-    public void testNonNullByClass() throws IOException
+    public void testNonNullByClass() throws Exception
     {
         Map<String,Object> result = writeAndMap(MAPPER, new NoNullsBean());
         assertEquals(1, result.size());
@@ -229,7 +245,7 @@ public void testNonNullByClass() throws IOException
     }
 
     @Test
-    public void testNonDefaultByClass() throws IOException
+    public void testNonDefaultByClass() throws Exception
     {
         NonDefaultBean bean = new NonDefaultBean();
         // need to change one of defaults
@@ -244,7 +260,7 @@ public void testNonDefaultByClass() throws IOException
 
     // [databind#998]
     @Test
-    public void testNonDefaultByClassNoCtor() throws IOException
+    public void testNonDefaultByClassNoCtor() throws Exception
     {
         NonDefaultBeanXYZ bean = new NonDefaultBeanXYZ(1, 2, 0);
         String json = MAPPER.writeValueAsString(bean);
@@ -252,7 +268,7 @@ public void testNonDefaultByClassNoCtor() throws IOException
     }
 
     @Test
-    public void testMixedMethod() throws IOException
+    public void testMixedMethod() throws Exception
     {
         MixedBean bean = new MixedBean();
         bean._a = "xyz";
@@ -271,20 +287,20 @@ public void testMixedMethod() throws IOException
     }
 
     @Test
-    public void testDefaultForEmptyList() throws IOException
+    public void testDefaultForEmptyList() throws Exception
     {
         assertEquals("{}", MAPPER.writeValueAsString(new ListBean()));
     }
 
-    // NON_DEFAULT shoud work for arrays too
+    // NON_DEFAULT should work for arrays too
     @Test
-    public void testNonEmptyDefaultArray() throws IOException
+    public void testNonEmptyDefaultArray() throws Exception
     {
         assertEquals("{}", MAPPER.writeValueAsString(new ArrayBean()));
     }
 
     @Test
-    public void testDefaultForIntegers() throws IOException
+    public void testDefaultForIntegers() throws Exception
     {
         assertEquals("{}", MAPPER.writeValueAsString(new DefaultIntBean(0, Integer.valueOf(0))));
         assertEquals("{\"i2\":1}", MAPPER.writeValueAsString(new DefaultIntBean(0, Integer.valueOf(1))));
@@ -292,7 +308,7 @@ public void testDefaultForIntegers() throws IOException
     }
 
     @Test
-    public void testEmptyInclusionScalars() throws IOException
+    public void testEmptyInclusionScalars() throws Exception
     {
         ObjectMapper defMapper = MAPPER;
         ObjectMapper inclMapper = new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
@@ -320,6 +336,31 @@ public void testEmptyInclusionScalars() throws IOException
         assertEquals("{\"i\":0}", inclMapper.writeValueAsString(zero));
     }
 
+    // for [databind#1327]
+    @Test
+    public void test1327ClassDefaultsForEmpty() throws Exception {
+        ObjectMapper om = new ObjectMapper();
+        om.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+
+        final String jsonString = om.writeValueAsString(new Issue1327BeanEmpty());
+
+        if (jsonString.contains("myList")) {
+            fail("Should not contain `myList`: "+jsonString);
+        }
+    }
+
+    @Test
+    public void test1327ClassDefaultsForAlways() throws Exception {
+        ObjectMapper om = new ObjectMapper();
+        om.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
+
+        final String jsonString = om.writeValueAsString(new Issue1327BeanAlways());
+
+        if (!jsonString.contains("myList")) {
+            fail("Should contain `myList` with Include.ALWAYS: "+jsonString);
+        }
+    }    
+
     // [databind#1351], [databind#1417]
     @Test
     public void testIssue1351() throws Exception
@@ -333,6 +374,15 @@ public void testIssue1351() throws Exception
                 mapper.writeValueAsString(new Issue1351NonBean(0)));
     }
 
+    // [databind#4741]
+    @Test
+    public void testSerialization4741() throws Exception
+    {
+        NonDefaultBean4741 bean = new NonDefaultBean4741();
+        bean.value = "";
+        assertEquals(a2q("{'value':''}"), MAPPER.writeValueAsString(bean));
+    }
+
     // [databind#1550]
     @Test
     public void testInclusionOfDate() throws Exception
diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/jdk/EnumNamingSerializationTest.java b/src/test/java/com/fasterxml/jackson/databind/ser/jdk/EnumNamingSerializationTest.java
index af8c46236d..68083e0b50 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ser/jdk/EnumNamingSerializationTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ser/jdk/EnumNamingSerializationTest.java
@@ -23,7 +23,7 @@ public class EnumNamingSerializationTest extends DatabindTestUtil {
 
     final ObjectMapper MAPPER = newJsonMapper();
 
-    @EnumNaming(EnumNamingStrategies.CamelCaseStrategy.class)
+    @EnumNaming(EnumNamingStrategies.LowerCamelCaseStrategy.class)
     static enum EnumFlavorA {
         CHOCOLATE_CHIPS,
         HOT_CHEETOS;
@@ -34,7 +34,7 @@ public String toString() {
         }
     }
 
-    @EnumNaming(EnumNamingStrategies.CamelCaseStrategy.class)
+    @EnumNaming(EnumNamingStrategies.LowerCamelCaseStrategy.class)
     static enum EnumSauceB {
         KETCH_UP,
         MAYO_NEZZ;
@@ -46,14 +46,14 @@ static enum EnumSauceC {
         SRIRACHA_MAYO;
     }
 
-    @EnumNaming(EnumNamingStrategies.CamelCaseStrategy.class)
+    @EnumNaming(EnumNamingStrategies.LowerCamelCaseStrategy.class)
     static enum EnumFlavorD {
         _PEANUT_BUTTER,
         PEANUT__BUTTER,
         PEANUT_BUTTER
     }
 
-    @EnumNaming(EnumNamingStrategies.CamelCaseStrategy.class)
+    @EnumNaming(EnumNamingStrategies.LowerCamelCaseStrategy.class)
     static enum EnumFlavorE {
         PEANUT_BUTTER,
         @JsonProperty("almond")
diff --git a/src/test/java/com/fasterxml/jackson/failing/UnwrappedCaching2461Test.java b/src/test/java/com/fasterxml/jackson/databind/struct/UnwrappedCaching2461Test.java
similarity index 97%
rename from src/test/java/com/fasterxml/jackson/failing/UnwrappedCaching2461Test.java
rename to src/test/java/com/fasterxml/jackson/databind/struct/UnwrappedCaching2461Test.java
index fe8409d88f..0ad8f1206e 100644
--- a/src/test/java/com/fasterxml/jackson/failing/UnwrappedCaching2461Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/struct/UnwrappedCaching2461Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.struct;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/com/fasterxml/jackson/databind/testutil/DatabindTestUtil.java b/src/test/java/com/fasterxml/jackson/databind/testutil/DatabindTestUtil.java
index cf4fc1d40f..002abe14da 100644
--- a/src/test/java/com/fasterxml/jackson/databind/testutil/DatabindTestUtil.java
+++ b/src/test/java/com/fasterxml/jackson/databind/testutil/DatabindTestUtil.java
@@ -367,7 +367,7 @@ protected static ObjectReader objectReader() {
 
     public static TypeFactory newTypeFactory() {
         // this is a work-around; no null modifier added
-        return TypeFactory.defaultInstance().withModifier(null);
+        return defaultTypeFactory().withModifier(null);
     }
 
     /*
@@ -560,6 +560,11 @@ public static TimeZone getUTCTimeZone() {
         return TimeZone.getTimeZone("GMT");
     }
 
+    // Separated out since "default" TypeFactory instance handling differs
+    // between 2.x and 3.x
+    public static TypeFactory defaultTypeFactory() {
+        return TypeFactory.defaultInstance();
+    }
 
     protected JsonParser createParserUsingReader(String input)
         throws IOException
diff --git a/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestFailureExpected.java b/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestFailureExpected.java
new file mode 100644
index 0000000000..66fca0d2cc
--- /dev/null
+++ b/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestFailureExpected.java
@@ -0,0 +1,40 @@
+package com.fasterxml.jackson.databind.testutil.failure;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * <p>
+ * Annotation used to indicate that a JUnit-5 based tests method is expected to fail.
+ *
+ * <p>
+ * When a test method is annotated with {@code @JacksonTestFailureExpected}, the
+ * {@link JacksonTestFailureExpectedInterceptor} will intercept the test execution.
+ * If the test passes, which is an unexpected behavior, the interceptor will throw an exception to fail the test,
+ * indicating that the test was expected to fail but didn't.
+ * </p>
+ *
+ * <h3>Usage Example:</h3>
+ *
+ * <pre><code>
+ *
+ *     &#64;Test
+ *     &#64;JacksonTestFailureExpected
+ *     public void testFeatureNotYetImplemented() {
+ *         // Test code that is expected to fail
+ *     }
+ * }
+ * </code></pre>
+ *
+ * <p>
+ *
+ * @since 2.19
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(JacksonTestFailureExpectedInterceptor.class)
+public @interface JacksonTestFailureExpected { }
diff --git a/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestFailureExpectedInterceptor.java b/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestFailureExpectedInterceptor.java
new file mode 100644
index 0000000000..767511bd1c
--- /dev/null
+++ b/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestFailureExpectedInterceptor.java
@@ -0,0 +1,46 @@
+package com.fasterxml.jackson.databind.testutil.failure;
+
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.InvocationInterceptor;
+import org.junit.jupiter.api.extension.ReflectiveInvocationContext;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+/**
+ * Custom {@link InvocationInterceptor} that intercepts test method invocation.
+ * To pass the test ***only if*** test fails with an exception, and fail the test otherwise.
+ *
+ * @since 2.19
+ */
+public class JacksonTestFailureExpectedInterceptor
+    implements InvocationInterceptor
+{
+
+    @Override
+    public void interceptTestMethod(Invocation<Void> invocation,
+                                    ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext)
+            throws Throwable {
+        try {
+            invocation.proceed();
+        } catch (Throwable t) {
+            // do-nothing, we do expect an exception
+            return;
+        }
+        handleUnexpectePassingTest(invocationContext);
+    }
+
+    private void handleUnexpectePassingTest(ReflectiveInvocationContext<Method> invocationContext) {
+        // Collect information we need
+        Object targetClass = invocationContext.getTargetClass();
+        Object testMethod = invocationContext.getExecutable().getName();
+        List<Object> arguments = invocationContext.getArguments();
+
+        // Create message
+        String message = String.format("Test method %s.%s() passed, but should have failed", targetClass, testMethod);
+
+        // throw exception
+        throw new JacksonTestShouldFailException(message);
+    }
+
+}
diff --git a/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestShouldFailException.java b/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestShouldFailException.java
new file mode 100644
index 0000000000..3a4d7375fd
--- /dev/null
+++ b/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestShouldFailException.java
@@ -0,0 +1,16 @@
+package com.fasterxml.jackson.databind.testutil.failure;
+
+/**
+ * Exception used to alert that a test is passing, but should be failing.
+ *
+ * WARNING : This only for test code, and should never be thrown from production code.
+ *
+ * @since 2.19
+ */
+public class JacksonTestShouldFailException
+    extends RuntimeException
+{
+    public JacksonTestShouldFailException(String msg) {
+        super(msg);
+    }
+}
diff --git a/src/test/java/com/fasterxml/jackson/failing/AnyGetterSorting518Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/AnyGetterSorting518Test.java
similarity index 89%
rename from src/test/java/com/fasterxml/jackson/failing/AnyGetterSorting518Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/AnyGetterSorting518Test.java
index 0cf9f53d1c..436df2947c 100644
--- a/src/test/java/com/fasterxml/jackson/failing/AnyGetterSorting518Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/AnyGetterSorting518Test.java
@@ -1,9 +1,10 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
@@ -43,6 +44,7 @@ public Bean(int a, int b, Map<String,Object> x) {
 
     private final ObjectMapper MAPPER = newJsonMapper();
 
+    @JacksonTestFailureExpected
     @Test
     void anyBeanWithSort() throws Exception
     {
diff --git a/src/test/java/com/fasterxml/jackson/failing/AnySetterAsCreatorFallback1401Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java
similarity index 89%
rename from src/test/java/com/fasterxml/jackson/failing/AnySetterAsCreatorFallback1401Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java
index a01eb0db33..8ea90658e5 100644
--- a/src/test/java/com/fasterxml/jackson/failing/AnySetterAsCreatorFallback1401Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java
@@ -1,5 +1,6 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonAnySetter;
@@ -36,6 +37,7 @@ public void any(String key, Object value) { }
     private final ObjectMapper MAPPER = newJsonMapper();
 
     // [databind#1401]
+    @JacksonTestFailureExpected
     @Test
     void creatorNoSetter() throws Exception
     {
diff --git a/src/test/java/com/fasterxml/jackson/failing/AsEmptyPOJONoDefaultCtor2572Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java
similarity index 89%
rename from src/test/java/com/fasterxml/jackson/failing/AsEmptyPOJONoDefaultCtor2572Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java
index e11af3c60c..7d2c801733 100644
--- a/src/test/java/com/fasterxml/jackson/failing/AsEmptyPOJONoDefaultCtor2572Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java
@@ -1,7 +1,8 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.Objects;
 
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.*;
@@ -34,6 +35,7 @@ public Inner(@JsonProperty("field") String field) {
     }
 
     // [databind#2572]
+    @JacksonTestFailureExpected
     @Test
     void emptyForTypeThatCannotBeInstantiated() throws Exception {
         ObjectMapper mapper = jsonMapperBuilder()
diff --git a/src/test/java/com/fasterxml/jackson/failing/BackReference1516Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/BackReference1516Test.java
similarity index 94%
rename from src/test/java/com/fasterxml/jackson/failing/BackReference1516Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/BackReference1516Test.java
index de2774f847..ed723d763b 100644
--- a/src/test/java/com/fasterxml/jackson/failing/BackReference1516Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/BackReference1516Test.java
@@ -1,7 +1,8 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.beans.ConstructorProperties;
 
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
@@ -74,6 +75,7 @@ public ChildObject2(String id, String name,
                     "  'child': { 'id': 'def', 'name':'Bert' }\n" +
                     "}");
 
+    @JacksonTestFailureExpected
     @Test
     void withParentCreator() throws Exception {
         ParentWithCreator result = MAPPER.readValue(PARENT_CHILD_JSON,
diff --git a/src/test/java/com/fasterxml/jackson/failing/BuilderWithBackRef2686Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/BuilderWithBackRef2686Test.java
similarity index 94%
rename from src/test/java/com/fasterxml/jackson/failing/BuilderWithBackRef2686Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/BuilderWithBackRef2686Test.java
index 08058a65a3..89f79eac03 100644
--- a/src/test/java/com/fasterxml/jackson/failing/BuilderWithBackRef2686Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/BuilderWithBackRef2686Test.java
@@ -1,7 +1,8 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.beans.ConstructorProperties;
 
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
@@ -90,6 +91,7 @@ Content build() {
 
     private final ObjectMapper MAPPER = newJsonMapper();
 
+    @JacksonTestFailureExpected
     @Test
     void buildWithBackRefs2686() throws Exception {
         Container container = new Container();
diff --git a/src/test/java/com/fasterxml/jackson/failing/CreatorFallback2438Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/CreatorFallback2438Test.java
similarity index 89%
rename from src/test/java/com/fasterxml/jackson/failing/CreatorFallback2438Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/CreatorFallback2438Test.java
index 6109e65c85..3692e6d996 100644
--- a/src/test/java/com/fasterxml/jackson/failing/CreatorFallback2438Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/CreatorFallback2438Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -7,6 +7,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -33,6 +34,7 @@ public void setValue(int v) {
 
     private final ObjectMapper MAPPER = newJsonMapper();
 
+    @JacksonTestFailureExpected
     @Test
     void creator2438() throws Exception {
         // note: by default, duplicate-detection not enabled, so should not
diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/CustomObjectKeyDeserializer4680Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/CustomObjectKeyDeserializer4680Test.java
new file mode 100644
index 0000000000..720212ce91
--- /dev/null
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/CustomObjectKeyDeserializer4680Test.java
@@ -0,0 +1,72 @@
+package com.fasterxml.jackson.databind.tofix;
+
+import java.util.Map;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.KeyDeserializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+// [databind#4680] Custom key deserialiser registered for `Object.class` is ignored on nested JSON
+public class CustomObjectKeyDeserializer4680Test
+{
+
+    @JacksonTestFailureExpected
+    @Test
+    void testCustomKeyDeserializer()
+            throws Exception
+    {
+        // GIVEN
+        String json =
+                "{\n" +
+                        "     \"name*\": \"Erik\",\n" +
+                        "     \"address*\": {\n" +
+                        "         \"city*\": {\n" +
+                        "             \"id*\": 1,\n" +
+                        "             \"name*\": \"Berlin\"\n" +
+                        "         },\n" +
+                        "         \"street*\": \"Elvirastr\"\n" +
+                        "     }\n" +
+                        " }";
+
+        SimpleModule keySanitizationModule = new SimpleModule("key-sanitization");
+        keySanitizationModule.addKeyDeserializer(String.class, new KeyDeserializer() {
+            @Override
+            public String deserializeKey(String key, DeserializationContext ctxt) {
+                return key.replace("*", "_");
+            }
+        });
+
+        keySanitizationModule.addKeyDeserializer(Object.class, new KeyDeserializer() {
+            @Override
+            public Object deserializeKey(String key, DeserializationContext ctxt) {
+                return key.replace("*", "_");
+            }
+        });
+
+        ObjectMapper mapper = JsonMapper.builder().addModule(keySanitizationModule).build();
+
+        // WHEN
+        Map<String, Object> result = mapper.readValue(json, new TypeReference<Map<String, Object>>() {
+        });
+
+        // THEN
+        // depth 1 works as expected
+        Assertions.assertEquals("Erik", result.get("name_"));
+
+        // before fix, depth 2 does NOT work as expected
+        Map<String, Object> addressMap = (Map<String, Object>) result.get("address_");
+        // before fix, null?? Fails here
+        Assertions.assertEquals("Elvirastr", addressMap.get("street_"));
+        Map<String, Object> cityMap = (Map<String, Object>) addressMap.get("city_");
+        Assertions.assertEquals(1, cityMap.get("id_"));
+        Assertions.assertEquals("Berlin", cityMap.get("name_"));
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/com/fasterxml/jackson/failing/DefaultTypingOverride1391Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/DefaultTypingOverride1391Test.java
similarity index 90%
rename from src/test/java/com/fasterxml/jackson/failing/DefaultTypingOverride1391Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/DefaultTypingOverride1391Test.java
index e71117d567..c7d7181c1c 100644
--- a/src/test/java/com/fasterxml/jackson/failing/DefaultTypingOverride1391Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/DefaultTypingOverride1391Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 import com.fasterxml.jackson.databind.testutil.NoCheckSubTypeValidator;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -25,6 +26,7 @@ static class ListWrapper {
         public Collection<String> stuff = Collections.emptyList();
     }
 
+    @JacksonTestFailureExpected
     @Test
     void collectionWithOverride() throws Exception {
         final ObjectMapper mapper = JsonMapper.builder()
diff --git a/src/test/java/com/fasterxml/jackson/failing/ExternalTypeIdWithUnwrapped2039Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java
similarity index 91%
rename from src/test/java/com/fasterxml/jackson/failing/ExternalTypeIdWithUnwrapped2039Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java
index 2c19289cef..fbf560468c 100644
--- a/src/test/java/com/fasterxml/jackson/failing/ExternalTypeIdWithUnwrapped2039Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -41,6 +42,7 @@ public static class SubA2039 extends SubType2039 {
         public boolean bool;
     }
 
+    @JacksonTestFailureExpected
     @Test
     void externalWithUnwrapped2039() throws Exception {
         final ObjectMapper mapper = newJsonMapper();
diff --git a/src/test/java/com/fasterxml/jackson/failing/JacksonInject2465Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2465Test.java
similarity index 92%
rename from src/test/java/com/fasterxml/jackson/failing/JacksonInject2465Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2465Test.java
index b03b88d1bd..2838751948 100644
--- a/src/test/java/com/fasterxml/jackson/failing/JacksonInject2465Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2465Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -45,6 +46,7 @@ public Internal2465(String val) {
     }
 
     // [databind#2465]
+    @JacksonTestFailureExpected
     @Test
     void injectWithCreator() throws Exception {
         ObjectMapper mapper = jsonMapperBuilder()
diff --git a/src/test/java/com/fasterxml/jackson/failing/JacksonInject2678Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2678Test.java
similarity index 93%
rename from src/test/java/com/fasterxml/jackson/failing/JacksonInject2678Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2678Test.java
index 8d2a385d97..20f1d41abc 100644
--- a/src/test/java/com/fasterxml/jackson/failing/JacksonInject2678Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2678Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.Objects;
 
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -40,6 +41,7 @@ public String getField2() {
     }
 
     // [databind#2678]
+    @JacksonTestFailureExpected
     @Test
     void readValueInjectables() throws Exception {
         final InjectableValues injectableValues =
diff --git a/src/test/java/com/fasterxml/jackson/failing/JacksonInject4218Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject4218Test.java
similarity index 91%
rename from src/test/java/com/fasterxml/jackson/failing/JacksonInject4218Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject4218Test.java
index 8896397573..fad3164a95 100644
--- a/src/test/java/com/fasterxml/jackson/failing/JacksonInject4218Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject4218Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -8,6 +8,7 @@
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -49,6 +50,7 @@ public Object findInjectableValue(
     }
 
     // [databind#4218]
+    @JacksonTestFailureExpected
     @Test
     void injectFail4218() throws Exception
     {
diff --git a/src/test/java/com/fasterxml/jackson/failing/JsonIdentityInfoAndBackReferences3964Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java
similarity index 97%
rename from src/test/java/com/fasterxml/jackson/failing/JsonIdentityInfoAndBackReferences3964Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java
index 8442e4a887..4a0d086b12 100644
--- a/src/test/java/com/fasterxml/jackson/failing/JsonIdentityInfoAndBackReferences3964Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.List;
 
@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -206,6 +207,7 @@ public static class Shrimp {
     /**
      * Fails : Original test
      */
+    @JacksonTestFailureExpected
     @Test
     void original() throws Exception {
         String json = "{" +
@@ -238,6 +240,7 @@ void original() throws Exception {
     /**
      * Fails : Lean version that fails and Without getters and setters
      */
+    @JacksonTestFailureExpected
     @Test
     void leanWithoutGetterAndSetters() throws Exception {
         String json = a2q("{" +
diff --git a/src/test/java/com/fasterxml/jackson/failing/JsonIgnoreProperties2803Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIgnoreProperties2803Test.java
similarity index 88%
rename from src/test/java/com/fasterxml/jackson/failing/JsonIgnoreProperties2803Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/JsonIgnoreProperties2803Test.java
index 7486714ca9..a3c13b747d 100644
--- a/src/test/java/com/fasterxml/jackson/failing/JsonIgnoreProperties2803Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIgnoreProperties2803Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -7,6 +7,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -29,6 +30,7 @@ static class Room2803 {
     private final ObjectMapper MAPPER = newJsonMapper();
 
     // [databind#2803]
+    @JacksonTestFailureExpected
     @Test
     void ignoreProps2803() throws Exception {
         final String DOC = "{\"lobby\":{\"id\":\"L1\"}}";
diff --git a/src/test/java/com/fasterxml/jackson/failing/JsonSetter2572Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonSetter2572Test.java
similarity index 91%
rename from src/test/java/com/fasterxml/jackson/failing/JsonSetter2572Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/JsonSetter2572Test.java
index a7a3b07bde..ed495d852c 100644
--- a/src/test/java/com/fasterxml/jackson/failing/JsonSetter2572Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonSetter2572Test.java
@@ -1,7 +1,8 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.Objects;
 
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.*;
@@ -14,6 +15,7 @@
 // different from 2.10 in that no exception thrown and databind quietly just
 // left `null` for Beans as `null` even if "EMPTY" was indicated by configuration.
 class JsonSetter2572Test extends DatabindTestUtil {
+
     static class Outer {
         @JsonProperty("inner")
         final Inner inner;
@@ -34,6 +36,7 @@ public Inner(@JsonProperty("field") String field) {
         }
     }
 
+    @JacksonTestFailureExpected
     @Test
     void setterWithEmpty() throws Exception {
         /*
@@ -48,7 +51,6 @@ void setterWithEmpty() throws Exception {
         Outer result = mapper.readValue(json, Outer.class);
         assertNotNull(result);
         assertNotNull(result.inner); // converted to "empty" bean
-
-//System.err.println("Final -> "+mapper.writeValueAsString(result));
     }
+
 }
diff --git a/src/test/java/com/fasterxml/jackson/failing/JsonTypeIdConflict3681Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonTypeIdConflict3681Test.java
similarity index 92%
rename from src/test/java/com/fasterxml/jackson/failing/JsonTypeIdConflict3681Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/JsonTypeIdConflict3681Test.java
index 9908d7f9db..09efa5431e 100644
--- a/src/test/java/com/fasterxml/jackson/failing/JsonTypeIdConflict3681Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonTypeIdConflict3681Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -8,6 +8,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -57,6 +58,7 @@ private static class WrapperC {
      *  private interface C extends A, B {}
      * </pre>
      */
+    @JacksonTestFailureExpected
     @Test
     void failureWithTypeIdConflict() throws Exception {
         WrapperC c = MAPPER.readValue(a2q("{'c': {'type': 'c_impl'}}"), WrapperC.class);
diff --git a/src/test/java/com/fasterxml/jackson/failing/KevinFail1410Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/KevinFail1410Test.java
similarity index 94%
rename from src/test/java/com/fasterxml/jackson/failing/KevinFail1410Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/KevinFail1410Test.java
index 7eafac0eb4..7b4b4ac25e 100644
--- a/src/test/java/com/fasterxml/jackson/failing/KevinFail1410Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/KevinFail1410Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -7,6 +7,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -79,6 +80,7 @@ public String toString() {
         }
     }
 
+    @JacksonTestFailureExpected
     @Test
     void dupProps() throws Exception {
         ObjectMapper mapper = newJsonMapper();
diff --git a/src/test/java/com/fasterxml/jackson/failing/MapEntryFormat1419Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/MapEntryFormat1419Test.java
similarity index 89%
rename from src/test/java/com/fasterxml/jackson/failing/MapEntryFormat1419Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/MapEntryFormat1419Test.java
index 8316bdd89f..d8810d5b27 100644
--- a/src/test/java/com/fasterxml/jackson/failing/MapEntryFormat1419Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/MapEntryFormat1419Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -29,6 +30,7 @@ public BeanWithMapEntryAsObject(String key, String value) {
 
     private final ObjectMapper MAPPER = new ObjectMapper();
 
+    @JacksonTestFailureExpected
     @Test
     void wrappedAsObjectRoundtrip() throws Exception {
         BeanWithMapEntryAsObject input = new BeanWithMapEntryAsObject("foo", "bar");
diff --git a/src/test/java/com/fasterxml/jackson/failing/MapInclusion1649Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/MapInclusion1649Test.java
similarity index 88%
rename from src/test/java/com/fasterxml/jackson/failing/MapInclusion1649Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/MapInclusion1649Test.java
index 9c1789fd2d..73ce902664 100644
--- a/src/test/java/com/fasterxml/jackson/failing/MapInclusion1649Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/MapInclusion1649Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.io.IOException;
 import java.util.LinkedHashMap;
@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -26,6 +27,7 @@ public Bean1649(String key, String value) {
     final private ObjectMapper MAPPER = objectMapper();
 
     // [databind#1649]
+    @JacksonTestFailureExpected
     @Test
     void nonEmptyViaClass() throws IOException {
         // non-empty/null, include
diff --git a/src/test/java/com/fasterxml/jackson/failing/MergeWithCreator1921Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/MergeWithCreator1921Test.java
similarity index 95%
rename from src/test/java/com/fasterxml/jackson/failing/MergeWithCreator1921Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/MergeWithCreator1921Test.java
index 34105a7d9c..8e249d8f45 100644
--- a/src/test/java/com/fasterxml/jackson/failing/MergeWithCreator1921Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/MergeWithCreator1921Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.Objects;
 
@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.exc.ValueInstantiationException;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -66,6 +67,7 @@ public String getValidTo() {
         }
     }
 
+    @JacksonTestFailureExpected
     @Test
     void mergeWithCreator() throws Exception {
         final String JSON = "{ \"validity\": { \"validFrom\": \"2018-02-01\", \"validTo\": \"2018-01-31\" } }";
diff --git a/src/test/java/com/fasterxml/jackson/failing/NoTypeInfo1654Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java
similarity index 93%
rename from src/test/java/com/fasterxml/jackson/failing/NoTypeInfo1654Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java
index 0902fa0f23..148f0c0c79 100644
--- a/src/test/java/com/fasterxml/jackson/failing/NoTypeInfo1654Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -79,6 +80,7 @@ void noTypeElementOverride() throws Exception {
     }
 
     // [databind#1654]
+    @JacksonTestFailureExpected
     @Test
     void noTypeInfoOverrideSer() throws Exception {
         Value1654UntypedContainer cont = new Value1654UntypedContainer(
@@ -90,6 +92,7 @@ void noTypeInfoOverrideSer() throws Exception {
     }
 
     // [databind#1654]
+    @JacksonTestFailureExpected
     @Test
     void noTypeInfoOverrideDeser() throws Exception {
         // and then actual failing case
diff --git a/src/test/java/com/fasterxml/jackson/failing/ObjectIdDeserializationFailTest.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdDeserializationFailTest.java
similarity index 93%
rename from src/test/java/com/fasterxml/jackson/failing/ObjectIdDeserializationFailTest.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdDeserializationFailTest.java
index 84b10e74bc..460a4f048f 100644
--- a/src/test/java/com/fasterxml/jackson/failing/ObjectIdDeserializationFailTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdDeserializationFailTest.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.ArrayList;
 import java.util.EnumMap;
@@ -10,7 +10,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.objectid.TestObjectId.Employee;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
-import com.fasterxml.jackson.failing.ObjectIdDeserializationFailTest.EnumMapCompany.FooEnum;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
+import com.fasterxml.jackson.databind.tofix.ObjectIdDeserializationFailTest.EnumMapCompany.FooEnum;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertSame;
@@ -52,6 +53,7 @@ public void setReports(List<DefensiveEmployee> reports) {
 
     private final ObjectMapper mapper = new ObjectMapper();
 
+    @JacksonTestFailureExpected
     @Test
     void forwardReferenceInArray() throws Exception {
         String json = "{\"employees\":["
@@ -81,6 +83,7 @@ void forwardReferenceInQueue() throws Exception {
         assertEmployees(firstEmployee, secondEmployee);
     }
 
+    @JacksonTestFailureExpected
     @Test
     void forwardReferenceInEnumMap()
             throws Exception {
@@ -96,6 +99,7 @@ void forwardReferenceInEnumMap()
         assertEmployees(firstEmployee, secondEmployee);
     }
 
+    @JacksonTestFailureExpected
     @Test
     void forwardReferenceWithDefensiveCopy()
             throws Exception {
diff --git a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithBuilder1496Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java
similarity index 94%
rename from src/test/java/com/fasterxml/jackson/failing/ObjectIdWithBuilder1496Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java
index a98d1a4b93..44ef296c8d 100644
--- a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithBuilder1496Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -80,6 +81,7 @@ public POJO readFromCacheOrBuild() {
 
     private final ObjectMapper MAPPER = newJsonMapper();
 
+    @JacksonTestFailureExpected
     @Test
     void builderId1496() throws Exception {
         POJO input = new POJOBuilder().id(123L).var(456).build();
diff --git a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithInjectable639Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectable639Test.java
similarity index 90%
rename from src/test/java/com/fasterxml/jackson/failing/ObjectIdWithInjectable639Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectable639Test.java
index 24a23d429a..2b368ea819 100644
--- a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithInjectable639Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectable639Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -34,6 +35,7 @@ public Child2(@JsonProperty("parent") Parent2 parent) {
     }
 
     // for [databind#639]
+    @JacksonTestFailureExpected
     @Test
     void objectIdWithInjectable() throws Exception {
         ObjectMapper mapper = new ObjectMapper()
diff --git a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithUnwrapping1298Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java
similarity index 94%
rename from src/test/java/com/fasterxml/jackson/failing/ObjectIdWithUnwrapping1298Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java
index 06ef109c65..eaee5dc6ce 100644
--- a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithUnwrapping1298Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.io.StringWriter;
 import java.util.ArrayList;
@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -53,6 +54,7 @@ public Child(@JsonProperty("name") String name) {
         }
     }
 
+    @JacksonTestFailureExpected
     @Test
     void objectIdWithRepeatedChild() throws Exception {
         ObjectMapper mapper = JsonMapper.builder()
diff --git a/src/test/java/com/fasterxml/jackson/failing/ParsingContextExtTypeId2747Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java
similarity index 92%
rename from src/test/java/com/fasterxml/jackson/failing/ParsingContextExtTypeId2747Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java
index a6c9f48a00..1161ec2722 100644
--- a/src/test/java/com/fasterxml/jackson/failing/ParsingContextExtTypeId2747Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -54,6 +55,7 @@ static String getCurrentLocationAsString(JsonParser p) {
     }
 
     // [databind#2747]
+    @JacksonTestFailureExpected
     @Test
     void locationAccessWithExtTypeId() throws Exception {
         ObjectReader objectReader = newJsonMapper().readerFor(Wrapper.class);
diff --git a/src/test/java/com/fasterxml/jackson/failing/PolymorphicArrays3194Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/PolymorphicArrays3194Test.java
similarity index 92%
rename from src/test/java/com/fasterxml/jackson/failing/PolymorphicArrays3194Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/PolymorphicArrays3194Test.java
index 19416e9356..5693eab006 100644
--- a/src/test/java/com/fasterxml/jackson/failing/PolymorphicArrays3194Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/PolymorphicArrays3194Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator;
 import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -18,6 +19,7 @@ static final class SomeBean {
         public Object[][] value;
     }
 
+    @JacksonTestFailureExpected
     @Test
     void twoDimensionalArrayMapping() throws Exception {
         PolymorphicTypeValidator typeValidator = BasicPolymorphicTypeValidator.builder()
diff --git a/src/test/java/com/fasterxml/jackson/failing/RecursiveIgnoreProperties1755Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java
similarity index 92%
rename from src/test/java/com/fasterxml/jackson/failing/RecursiveIgnoreProperties1755Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java
index 59af117c1f..3ffc3c1be0 100644
--- a/src/test/java/com/fasterxml/jackson/failing/RecursiveIgnoreProperties1755Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -43,6 +44,7 @@ static class Item4417 {
     private final ObjectMapper MAPPER = newJsonMapper();
 
     // for [databind#1755]
+    @JacksonTestFailureExpected
     @Test
     void recursiveIgnore1755() throws Exception
     {
@@ -75,6 +77,7 @@ void recursiveIgnore1755() throws Exception
     }
 
     // for [databind#4417]
+    @JacksonTestFailureExpected
     @Test
     void recursiveIgnore4417() throws Exception
     {
diff --git a/src/test/java/com/fasterxml/jackson/failing/RecursiveWildcard4118Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveWildcard4118Test.java
similarity index 93%
rename from src/test/java/com/fasterxml/jackson/failing/RecursiveWildcard4118Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveWildcard4118Test.java
index 55248a26c5..d8d113279a 100644
--- a/src/test/java/com/fasterxml/jackson/failing/RecursiveWildcard4118Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveWildcard4118Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -55,6 +56,7 @@ public TestObject4118(List<TestAttribute4118<?>> attributes) {
     private final ObjectMapper MAPPER = newJsonMapper();
 
     // for [databind#4118]
+    @JacksonTestFailureExpected
     @Test
     void recursiveWildcard4118() throws Exception {
         Tree<?> tree = MAPPER.readValue("[[[]]]", new TypeReference<Tree<?>>() {
@@ -66,6 +68,7 @@ void recursiveWildcard4118() throws Exception {
     }
 
     // for [databind#4118]
+    @JacksonTestFailureExpected
     @Test
     void deserWildcard4118() throws Exception {
         // Given
diff --git a/src/test/java/com/fasterxml/jackson/failing/SetterlessList2692Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessList2692Test.java
similarity index 87%
rename from src/test/java/com/fasterxml/jackson/failing/SetterlessList2692Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessList2692Test.java
index 750e1607af..b7de71848a 100644
--- a/src/test/java/com/fasterxml/jackson/failing/SetterlessList2692Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessList2692Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 class SetterlessList2692Test extends DatabindTestUtil {
     static class DataBean {
@@ -35,6 +36,7 @@ public String toString() {
         }
     }
 
+    @JacksonTestFailureExpected
     @Test
     void issue2692() throws Exception {
         ObjectMapper om = newJsonMapper();
diff --git a/src/test/java/com/fasterxml/jackson/failing/SetterlessProperties501Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessProperties501Test.java
similarity index 93%
rename from src/test/java/com/fasterxml/jackson/failing/SetterlessProperties501Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessProperties501Test.java
index 9eba2549b7..ea317b533d 100644
--- a/src/test/java/com/fasterxml/jackson/failing/SetterlessProperties501Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessProperties501Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -12,6 +12,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 import com.fasterxml.jackson.databind.testutil.NoCheckSubTypeValidator;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -55,6 +56,7 @@ public Map<String, Poly> getMap() {
     }
 
     // For [databind#501]
+    @JacksonTestFailureExpected
     @Test
     void setterlessWithPolymorphic() throws Exception {
         Issue501Bean input = new Issue501Bean("a", new Poly(13));
diff --git a/src/test/java/com/fasterxml/jackson/failing/StaticTyping1515Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/StaticTyping1515Test.java
similarity index 92%
rename from src/test/java/com/fasterxml/jackson/failing/StaticTyping1515Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/StaticTyping1515Test.java
index 8d2c74556f..d2167b047b 100644
--- a/src/test/java/com/fasterxml/jackson/failing/StaticTyping1515Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/StaticTyping1515Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -67,12 +68,14 @@ static class Issue515Lists {
             .enable(MapperFeature.USE_STATIC_TYPING)
             .build();
 
+    @JacksonTestFailureExpected
     @Test
     void staticTypingForProperties() throws Exception {
         String json = STAT_MAPPER.writeValueAsString(new Issue515Singles());
         assertEquals(a2q("{'value':{'a':1},'aValue':{'a':1,'b':2},'dValue':{'a':3,'b':4}}"), json);
     }
 
+    @JacksonTestFailureExpected
     @Test
     void staticTypingForLists() throws Exception {
         String json = STAT_MAPPER.writeValueAsString(new Issue515Lists());
diff --git a/src/test/java/com/fasterxml/jackson/failing/UnwrappedWithUnknown650Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedWithUnknown650Test.java
similarity index 86%
rename from src/test/java/com/fasterxml/jackson/failing/UnwrappedWithUnknown650Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedWithUnknown650Test.java
index fb19a43917..666cf29660 100644
--- a/src/test/java/com/fasterxml/jackson/failing/UnwrappedWithUnknown650Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedWithUnknown650Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -22,6 +23,7 @@ static class B {
 
     private final ObjectMapper MAPPER = new ObjectMapper();
 
+    @JacksonTestFailureExpected
     @Test
     void failOnUnknownPropertyUnwrapped() throws Exception {
         assertTrue(MAPPER.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
diff --git a/src/test/java/com/fasterxml/jackson/databind/type/JavaTypeTest.java b/src/test/java/com/fasterxml/jackson/databind/type/JavaTypeTest.java
index e53a97f99e..e6342ac420 100644
--- a/src/test/java/com/fasterxml/jackson/databind/type/JavaTypeTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/type/JavaTypeTest.java
@@ -12,6 +12,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -19,7 +20,7 @@
  * Simple tests to verify that {@link JavaType} types work to
  * some degree
  */
-public class JavaTypeTest
+public class JavaTypeTest extends DatabindTestUtil
 {
     static class BaseType { }
 
@@ -74,7 +75,7 @@ static interface StringIterator extends Iterator<String> { }
     @Test
     public void testLocalType728() throws Exception
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         Method m = Issue728.class.getMethod("method", CharSequence.class);
         assertNotNull(m);
 
@@ -96,7 +97,7 @@ public void testLocalType728() throws Exception
     @Test
     public void testSimpleClass()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         JavaType baseType = tf.constructType(BaseType.class);
         assertSame(BaseType.class, baseType.getRawClass());
         assertTrue(baseType.hasRawClass(BaseType.class));
@@ -123,7 +124,7 @@ public void testSimpleClass()
     @Test
     public void testDeprecated()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         JavaType baseType = tf.constructType(BaseType.class);
         assertTrue(baseType.hasRawClass(BaseType.class));
         assertNull(baseType.getParameterSource());
@@ -136,7 +137,7 @@ public void testDeprecated()
     @Test
     public void testArrayType()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         JavaType arrayT = ArrayType.construct(tf.constructType(String.class), null);
         assertNotNull(arrayT);
         assertTrue(arrayT.isContainerType());
@@ -160,7 +161,7 @@ public void testArrayType()
     @Test
     public void testMapType()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         JavaType mapT = tf.constructType(HashMap.class);
         assertTrue(mapT.isContainerType());
         assertFalse(mapT.isIterationType());
@@ -183,7 +184,7 @@ public void testMapType()
     @Test
     public void testEnumType()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         JavaType enumT = tf.constructType(MyEnum.class);
         // JDK actually works fine with "basic" Enum types...
         assertTrue(enumT.getRawClass().isEnum());
@@ -233,7 +234,7 @@ public void testClassKey()
     @Test
     public void testJavaTypeAsJLRType()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         JavaType t1 = tf.constructType(getClass());
         // should just get it back as-is:
         JavaType t2 = tf.constructType(t1);
@@ -244,7 +245,7 @@ public void testJavaTypeAsJLRType()
     @Test
     public void testGenericSignature1194() throws Exception
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         Method m;
         JavaType t;
 
@@ -267,7 +268,7 @@ public void testGenericSignature1194() throws Exception
     @Test
     public void testAnchorTypeForRefTypes() throws Exception
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         JavaType t  = tf.constructType(AtomicStringReference.class);
         assertTrue(t.isReferenceType());
         assertTrue(t.hasContentType());
@@ -283,7 +284,7 @@ public void testAnchorTypeForRefTypes() throws Exception
     @Test
     public void testObjectToReferenceSpecialization() throws Exception
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         JavaType base = tf.constructType(Object.class);
         assertTrue(base.isJavaLangObject());
 
@@ -296,7 +297,7 @@ public void testObjectToReferenceSpecialization() throws Exception
     @Test
     public void testConstructReferenceType() throws Exception
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         // do AtomicReference<Long>
         final JavaType refdType = tf.constructType(Long.class);
         JavaType t  = tf.constructReferenceType(AtomicReference.class, refdType);
@@ -317,7 +318,7 @@ public void testConstructReferenceType() throws Exception
     @Test
     public void testIterationTypesDirect() throws Exception
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
 
         // First, type-erased types
         _verifyIteratorType(tf.constructType(Iterator.class),
@@ -347,7 +348,7 @@ public void testIterationTypesDirect() throws Exception
     @Test
     public void testIterationTypesFromValues() throws Exception
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         List<String> strings = Arrays.asList("foo", "bar");
         // We will get type-erased, alas, so:
         Iterator<String> stringIT = strings.iterator();
@@ -362,7 +363,7 @@ public void testIterationTypesFromValues() throws Exception
     @Test
     public void testIterationSubTypes() throws Exception
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         _verifyIteratorType(tf.constructType(StringIterator.class),
                 StringIterator.class, String.class);
         _verifyIteratorType(tf.constructType(StringStream.class),
diff --git a/src/test/java/com/fasterxml/jackson/databind/type/RecursiveTypeTest.java b/src/test/java/com/fasterxml/jackson/databind/type/RecursiveTypeTest.java
index 603f756298..7679a7da2f 100644
--- a/src/test/java/com/fasterxml/jackson/databind/type/RecursiveTypeTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/type/RecursiveTypeTest.java
@@ -5,12 +5,11 @@
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.newJsonMapper;
-
-public class RecursiveTypeTest
+public class RecursiveTypeTest extends DatabindTestUtil
 {
     // for [databind#1301]
     @SuppressWarnings("serial")
@@ -61,7 +60,7 @@ static <L, R> ImmutablePair<L, R> of(final L left, final R right) {
     @Test
     public void testRecursiveType()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         JavaType type = tf.constructType(HashTree.class);
         assertNotNull(type);
     }
diff --git a/src/test/java/com/fasterxml/jackson/databind/type/TypeBindingsTest.java b/src/test/java/com/fasterxml/jackson/databind/type/TypeBindingsTest.java
index 7ae39b11fb..9c8f496075 100644
--- a/src/test/java/com/fasterxml/jackson/databind/type/TypeBindingsTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/type/TypeBindingsTest.java
@@ -5,17 +5,16 @@
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.*;
 
-import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.verifyException;
-
 /**
  * Simple tests to verify for generic type binding functionality
  * implemented by {@link TypeBindings} class.
  */
-public class TypeBindingsTest
+public class TypeBindingsTest extends DatabindTestUtil
 {
     static class AbstractType<A,B> { }
 
@@ -45,7 +44,7 @@ static class HashTree<K, V> extends HashMap<K, HashTree<K, V>> { }
     /**********************************************************
      */
 
-    private final TypeFactory DEFAULT_TF = TypeFactory.defaultInstance();
+    private final TypeFactory DEFAULT_TF = defaultTypeFactory();
 
     @Test
     public void testInnerType() throws Exception
diff --git a/src/test/java/com/fasterxml/jackson/databind/type/TypeFactory3108Test.java b/src/test/java/com/fasterxml/jackson/databind/type/TypeFactory3108Test.java
index ad6134dd27..792f367024 100644
--- a/src/test/java/com/fasterxml/jackson/databind/type/TypeFactory3108Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/type/TypeFactory3108Test.java
@@ -6,13 +6,14 @@
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 // [databind#3108]: canonical type description for non-generic subtypes
 @SuppressWarnings("serial")
-public class TypeFactory3108Test
+public class TypeFactory3108Test extends DatabindTestUtil
 {
     static class StringList3108 extends ArrayList<String> {}
 
@@ -22,14 +23,15 @@ static class ParamType3108<T> {}
 
     static class ConcreteType3108 extends ParamType3108<Integer> {}
 
+    private final TypeFactory TF = defaultTypeFactory();
+
     // [databind#3108] with custom Collection
     @Test
     public void testCanonicalWithCustomCollection()
     {
-        final TypeFactory tf = TypeFactory.defaultInstance();
-        JavaType stringListType = tf.constructType(StringList3108.class);
+        JavaType stringListType = TF.constructType(StringList3108.class);
         String canonical = stringListType.toCanonical();
-        JavaType type = tf.constructFromCanonical(canonical);
+        JavaType type = TF.constructFromCanonical(canonical);
         assertEquals(StringList3108.class, type.getRawClass());
         assertTrue(type.isCollectionLikeType());
     }
@@ -38,10 +40,9 @@ public void testCanonicalWithCustomCollection()
     @Test
     public void testCanonicalWithCustomMap()
     {
-        final TypeFactory tf = TypeFactory.defaultInstance();
-        JavaType stringListType = tf.constructType(StringStringMap3108.class);
+        JavaType stringListType = TF.constructType(StringStringMap3108.class);
         String canonical = stringListType.toCanonical();
-        JavaType type = tf.constructFromCanonical(canonical);
+        JavaType type = TF.constructFromCanonical(canonical);
         assertEquals(StringStringMap3108.class, type.getRawClass());
         assertTrue(type.isMapLikeType());
     }
@@ -50,10 +51,9 @@ public void testCanonicalWithCustomMap()
     @Test
     public void testCanonicalWithCustomGenericType()
     {
-        final TypeFactory tf = TypeFactory.defaultInstance();
-        JavaType stringListType = tf.constructType(ConcreteType3108.class);
+        JavaType stringListType = TF.constructType(ConcreteType3108.class);
         String canonical = stringListType.toCanonical();
-        JavaType type = tf.constructFromCanonical(canonical);
+        JavaType type = TF.constructFromCanonical(canonical);
         assertEquals(ConcreteType3108.class, type.getRawClass());
     }
 }
diff --git a/src/test/java/com/fasterxml/jackson/databind/type/TypeFactoryTest.java b/src/test/java/com/fasterxml/jackson/databind/type/TypeFactoryTest.java
index f63a214ada..6670fab752 100644
--- a/src/test/java/com/fasterxml/jackson/databind/type/TypeFactoryTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/type/TypeFactoryTest.java
@@ -8,19 +8,17 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.*;
 
-import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.newTypeFactory;
-import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.verifyException;
-
 /**
  * Simple tests to verify that the {@link TypeFactory} constructs
  * type information as expected.
  */
-public class TypeFactoryTest
+public class TypeFactoryTest extends DatabindTestUtil
 {
     /*
     /**********************************************************
@@ -83,6 +81,8 @@ static class Wrapper1297<T> {
         public T content;
     }
 
+    private final TypeFactory TF = defaultTypeFactory();
+
     /*
     /**********************************************************
     /* Unit tests
@@ -108,10 +108,9 @@ public void testSimpleTypes()
                 Date.class,
         };
 
-        TypeFactory tf = TypeFactory.defaultInstance();
         for (Class<?> clz : classes) {
-            assertSame(clz, tf.constructType(clz).getRawClass());
-            assertSame(clz, tf.constructType(clz).getRawClass());
+            assertSame(clz, TF.constructType(clz).getRawClass());
+            assertSame(clz, TF.constructType(clz).getRawClass());
         }
     }
 
@@ -127,11 +126,10 @@ public void testArrays()
                 Calendar[].class,
         };
 
-        TypeFactory tf = TypeFactory.defaultInstance();
         for (Class<?> clz : classes) {
-            assertSame(clz, tf.constructType(clz).getRawClass());
+            assertSame(clz, TF.constructType(clz).getRawClass());
             Class<?> elemType = clz.getComponentType();
-            assertSame(clz, tf.constructArrayType(elemType).getRawClass());
+            assertSame(clz, TF.constructArrayType(elemType).getRawClass());
         }
     }
 
@@ -139,8 +137,7 @@ public void testArrays()
     @Test
     public void testProperties()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
-        JavaType t = tf.constructType(Properties.class);
+        JavaType t = TF.constructType(Properties.class);
         assertEquals(MapType.class, t.getClass());
         assertSame(Properties.class, t.getRawClass());
 
@@ -155,13 +152,12 @@ public void testProperties()
     @Test
     public void testIterator()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
-        JavaType t = tf.constructType(new TypeReference<Iterator<String>>() { });
+        JavaType t = TF.constructType(new TypeReference<Iterator<String>>() { });
         assertEquals(IterationType.class, t.getClass());
         assertTrue(t.isIterationType());
         assertSame(Iterator.class, t.getRawClass());
         assertEquals(1, t.containedTypeCount());
-        assertEquals(tf.constructType(String.class), t.containedType(0));
+        assertEquals(TF.constructType(String.class), t.containedType(0));
         assertNull(t.containedType(1));
     }
 
@@ -173,17 +169,16 @@ public void testIterator()
     @Test
     public void testParametricTypes()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
         // first, simple class based
-        final JavaType t = tf.constructParametrizedType(ArrayList.class, Collection.class, String.class); // ArrayList<String>
+        final JavaType t = TF.constructParametrizedType(ArrayList.class, Collection.class, String.class); // ArrayList<String>
         assertEquals(CollectionType.class, t.getClass());
-        JavaType strC = tf.constructType(String.class);
+        JavaType strC = TF.constructType(String.class);
         assertEquals(1, t.containedTypeCount());
         assertEquals(strC, t.containedType(0));
         assertNull(t.containedType(1));
 
         // Then using JavaType
-        JavaType t2 = tf.constructParametrizedType(Map.class, Map.class, strC, t); // Map<String,ArrayList<String>>
+        JavaType t2 = TF.constructParametrizedType(Map.class, Map.class, strC, t); // Map<String,ArrayList<String>>
         // should actually produce a MapType
         assertEquals(MapType.class, t2.getClass());
         assertEquals(2, t2.containedTypeCount());
@@ -192,14 +187,14 @@ public void testParametricTypes()
         assertNull(t2.containedType(2));
 
         // [databind#921]: using type bindings
-        JavaType t3 = tf.constructParametricType(HashSet.class, t.getBindings()); // HashSet<String>
+        JavaType t3 = TF.constructParametricType(HashSet.class, t.getBindings()); // HashSet<String>
         assertEquals(CollectionType.class, t3.getClass());
         assertEquals(1, t3.containedTypeCount());
         assertEquals(strC, t3.containedType(0));
         assertNull(t3.containedType(1));
 
         // and then custom generic type as well
-        JavaType custom = tf.constructParametrizedType(SingleArgGeneric.class, SingleArgGeneric.class,
+        JavaType custom = TF.constructParametrizedType(SingleArgGeneric.class, SingleArgGeneric.class,
                 String.class);
         assertEquals(SimpleType.class, custom.getClass());
         assertEquals(1, custom.containedTypeCount());
@@ -207,7 +202,7 @@ public void testParametricTypes()
         assertNull(custom.containedType(1));
 
         // and then custom generic type from TypeBindings ([databind#921])
-        JavaType custom2 = tf.constructParametricType(SingleArgGeneric.class, t.getBindings());
+        JavaType custom2 = TF.constructParametricType(SingleArgGeneric.class, t.getBindings());
         assertEquals(SimpleType.class, custom2.getClass());
         assertEquals(1, custom2.containedTypeCount());
         assertEquals(strC, custom2.containedType(0));
@@ -221,20 +216,19 @@ public void testParametricTypes()
     @Test
     public void testInvalidParametricTypes()
     {
-        final TypeFactory tf = TypeFactory.defaultInstance();
-        final JavaType strC = tf.constructType(String.class);
+        final JavaType strC = TF.constructType(String.class);
 
         // ensure that we can't create invalid combinations
         try {
             // Maps must take 2 type parameters, not just one
-            tf.constructParametrizedType(Map.class, Map.class, strC);
+            TF.constructParametrizedType(Map.class, Map.class, strC);
         } catch (IllegalArgumentException e) {
             verifyException(e, "Cannot create TypeBindings for class java.util.Map");
         }
 
         try {
             // Type only accepts one type param
-            tf.constructParametrizedType(SingleArgGeneric.class, SingleArgGeneric.class, strC, strC);
+            TF.constructParametrizedType(SingleArgGeneric.class, SingleArgGeneric.class, strC, strC);
         } catch (IllegalArgumentException e) {
             verifyException(e, "Cannot create TypeBindings for class ");
         }
@@ -246,40 +240,39 @@ public void testInvalidParametricTypes()
     @Test
     public void testCanonicalNames()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
-        JavaType t = tf.constructType(java.util.Calendar.class);
+        JavaType t = TF.constructType(java.util.Calendar.class);
         String can = t.toCanonical();
         assertEquals("java.util.Calendar", can);
-        assertEquals(t, tf.constructFromCanonical(can));
+        assertEquals(t, TF.constructFromCanonical(can));
 
         // Generic maps and collections will default to Object.class if type-erased
-        t = tf.constructType(java.util.ArrayList.class);
+        t = TF.constructType(java.util.ArrayList.class);
         can = t.toCanonical();
         assertEquals("java.util.ArrayList<java.lang.Object>", can);
-        assertEquals(t, tf.constructFromCanonical(can));
+        assertEquals(t, TF.constructFromCanonical(can));
 
-        t = tf.constructType(java.util.TreeMap.class);
+        t = TF.constructType(java.util.TreeMap.class);
         can = t.toCanonical();
         assertEquals("java.util.TreeMap<java.lang.Object,java.lang.Object>", can);
-        assertEquals(t, tf.constructFromCanonical(can));
+        assertEquals(t, TF.constructFromCanonical(can));
 
         // And then EnumMap (actual use case for us)
-        t = tf.constructMapType(EnumMap.class, EnumForCanonical.class, String.class);
+        t = TF.constructMapType(EnumMap.class, EnumForCanonical.class, String.class);
         can = t.toCanonical();
         assertEquals("java.util.EnumMap<com.fasterxml.jackson.databind.type.TypeFactoryTest$EnumForCanonical,java.lang.String>",
                 can);
-        assertEquals(t, tf.constructFromCanonical(can));
+        assertEquals(t, TF.constructFromCanonical(can));
 
         // [databind#2109]: also ReferenceTypes
-        t = tf.constructType(new TypeReference<AtomicReference<Long>>() { });
+        t = TF.constructType(new TypeReference<AtomicReference<Long>>() { });
         assertTrue(t.isReferenceType());
         can = t.toCanonical();
         assertEquals("java.util.concurrent.atomic.AtomicReference<java.lang.Long>",
                 can);
-        assertEquals(t, tf.constructFromCanonical(can));
+        assertEquals(t, TF.constructFromCanonical(can));
 
         // [databind#1941]: allow "raw" types too
-        t = tf.constructFromCanonical("java.util.List");
+        t = TF.constructFromCanonical("java.util.List");
         assertEquals(List.class, t.getRawClass());
         assertEquals(CollectionType.class, t.getClass());
         // 01-Mar-2018, tatu: not 100% should we expect type parameters here...
@@ -291,7 +284,7 @@ public void testCanonicalNames()
         assertEquals(Object.class, t.getContentType().getRawClass());
         can = t.toCanonical();
         assertEquals("java.util.List<java.lang.Object>", can);
-        assertEquals(t, tf.constructFromCanonical(can));
+        assertEquals(t, TF.constructFromCanonical(can));
     }
 
     // [databind#1768]
@@ -299,12 +292,11 @@ public void testCanonicalNames()
     @Test
     public void testCanonicalWithSpaces()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
         Object objects = new TreeMap<Object, Object>() { }; // to get subtype
         String reflectTypeName = objects.getClass().getGenericSuperclass().toString();
-        JavaType t1 = tf.constructType(objects.getClass().getGenericSuperclass());
+        JavaType t1 = TF.constructType(objects.getClass().getGenericSuperclass());
         // This will throw an Exception if you don't remove all white spaces from the String.
-        JavaType t2 = tf.constructFromCanonical(reflectTypeName);
+        JavaType t2 = TF.constructFromCanonical(reflectTypeName);
         assertNotNull(t2);
         assertEquals(t2, t1);
     }
@@ -313,8 +305,6 @@ public void testCanonicalWithSpaces()
     @Test
     public void testMalicousCanonical()
     {
-        final TypeFactory tf = TypeFactory.defaultInstance();
-
         // First: too deep nesting
         final int NESTING = TypeParser.MAX_TYPE_NESTING + 100;
         StringBuilder sb = new StringBuilder();
@@ -328,7 +318,7 @@ public void testMalicousCanonical()
 
         final String deepCanonical = sb.toString();
         Exception e = assertThrows(IllegalArgumentException.class,
-                   () -> tf.constructFromCanonical(deepCanonical));
+                   () -> TF.constructFromCanonical(deepCanonical));
         verifyException(e, "too deeply nested");
 
         // And second, too long in general
@@ -340,7 +330,7 @@ public void testMalicousCanonical()
         sb.append("java.lang.Integer>");
         final String longCanonical = sb.toString();
         e = assertThrows(IllegalArgumentException.class,
-                () -> tf.constructFromCanonical(longCanonical));
+                () -> TF.constructFromCanonical(longCanonical));
          verifyException(e, "too long");
     }
 
@@ -354,17 +344,16 @@ public void testMalicousCanonical()
     public void testCollections()
     {
         // Ok, first: let's test what happens when we pass 'raw' Collection:
-        final TypeFactory tf = TypeFactory.defaultInstance();
-        JavaType t = tf.constructType(ArrayList.class);
+        JavaType t = TF.constructType(ArrayList.class);
         assertEquals(CollectionType.class, t.getClass());
         assertSame(ArrayList.class, t.getRawClass());
         assertSame(Object.class, ((CollectionType) t).getContentType().getRawClass());
 
         // Also check equality (so caching by JavaType will work)
-        assertEqualsAndHash(t, tf.constructType(ArrayList.class));
+        assertEqualsAndHash(t, TF.constructType(ArrayList.class));
 
         // And then the proper way
-        t = tf.constructType(new TypeReference<ArrayList<String>>() { });
+        t = TF.constructType(new TypeReference<ArrayList<String>>() { });
         assertEquals(CollectionType.class, t.getClass());
         assertSame(ArrayList.class, t.getRawClass());
 
@@ -373,14 +362,14 @@ public void testCollections()
         assertSame(SimpleType.class, elemType.getClass());
         assertSame(String.class, elemType.getRawClass());
 
-        assertEqualsAndHash(t, tf.constructType(new TypeReference<ArrayList<String>>() { }));
+        assertEqualsAndHash(t, TF.constructType(new TypeReference<ArrayList<String>>() { }));
 
         // And alternate method too
-        t = tf.constructCollectionType(ArrayList.class, String.class);
+        t = TF.constructCollectionType(ArrayList.class, String.class);
         assertEquals(CollectionType.class, t.getClass());
         assertSame(String.class, ((CollectionType) t).getContentType().getRawClass());
 
-        assertEqualsAndHash(t, tf.constructCollectionType(ArrayList.class, String.class));
+        assertEqualsAndHash(t, TF.constructCollectionType(ArrayList.class, String.class));
     }
 
     // [databind#2796]
@@ -388,10 +377,9 @@ public void testCollections()
     @Test
     public void testCollectionsWithBindings()
     {
-        final TypeFactory tf = TypeFactory.defaultInstance();
         TypeBindings tb = TypeBindings.create(Set.class, new JavaType[] {
-                tf.constructType(String.class) });
-        JavaType t = tf.constructType(ArrayList.class, tb);
+                TF.constructType(String.class) });
+        JavaType t = TF.constructType(ArrayList.class, tb);
         assertEquals(CollectionType.class, t.getClass());
         assertSame(ArrayList.class, t.getRawClass());
         assertSame(String.class, ((CollectionType) t).getContentType().getRawClass());
@@ -560,34 +548,32 @@ public void testTypeGeneralization()
     @Test
     public void testMapTypesRaw()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
-        JavaType type = tf.constructType(HashMap.class);
+        JavaType type = TF.constructType(HashMap.class);
         assertEquals(MapType.class, type.getClass());
         MapType mapType = (MapType) type;
-        assertEquals(tf.constructType(Object.class), mapType.getKeyType());
-        assertEquals(tf.constructType(Object.class), mapType.getContentType());
+        assertEquals(TF.constructType(Object.class), mapType.getKeyType());
+        assertEquals(TF.constructType(Object.class), mapType.getContentType());
     }
 
     @Test
     public void testMapTypesAdvanced()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
-        JavaType type = tf.constructType(MyMap.class);
+        JavaType type = TF.constructType(MyMap.class);
         assertEquals(MapType.class, type.getClass());
         MapType mapType = (MapType) type;
-        assertEquals(tf.constructType(String.class), mapType.getKeyType());
-        assertEquals(tf.constructType(Long.class), mapType.getContentType());
+        assertEquals(TF.constructType(String.class), mapType.getKeyType());
+        assertEquals(TF.constructType(Long.class), mapType.getContentType());
 
-        type = tf.constructType(MapInterface.class);
+        type = TF.constructType(MapInterface.class);
         mapType = (MapType) type;
 
-        assertEquals(tf.constructType(String.class), mapType.getKeyType());
-        assertEquals(tf.constructType(Integer.class), mapType.getContentType());
+        assertEquals(TF.constructType(String.class), mapType.getKeyType());
+        assertEquals(TF.constructType(Integer.class), mapType.getContentType());
 
-        type = tf.constructType(MyStringIntMap.class);
+        type = TF.constructType(MyStringIntMap.class);
         mapType = (MapType) type;
-        assertEquals(tf.constructType(String.class), mapType.getKeyType());
-        assertEquals(tf.constructType(Integer.class), mapType.getContentType());
+        assertEquals(TF.constructType(String.class), mapType.getKeyType());
+        assertEquals(TF.constructType(Integer.class), mapType.getContentType());
     }
 
     /**
@@ -597,12 +583,11 @@ public void testMapTypesAdvanced()
     @Test
     public void testMapTypesSneaky()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
-        JavaType type = tf.constructType(IntLongMap.class);
+        JavaType type = TF.constructType(IntLongMap.class);
         assertEquals(MapType.class, type.getClass());
         MapType mapType = (MapType) type;
-        assertEquals(tf.constructType(Integer.class), mapType.getKeyType());
-        assertEquals(tf.constructType(Long.class), mapType.getContentType());
+        assertEquals(TF.constructType(Integer.class), mapType.getKeyType());
+        assertEquals(TF.constructType(Long.class), mapType.getContentType());
     }
 
     /**
@@ -611,19 +596,18 @@ public void testMapTypesSneaky()
     @Test
     public void testSneakyFieldTypes() throws Exception
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
         Field field = SneakyBean.class.getDeclaredField("intMap");
-        JavaType type = tf.constructType(field.getGenericType());
+        JavaType type = TF.constructType(field.getGenericType());
         assertEquals(MapType.class, type.getClass());
         MapType mapType = (MapType) type;
-        assertEquals(tf.constructType(Integer.class), mapType.getKeyType());
-        assertEquals(tf.constructType(Long.class), mapType.getContentType());
+        assertEquals(TF.constructType(Integer.class), mapType.getKeyType());
+        assertEquals(TF.constructType(Long.class), mapType.getContentType());
 
         field = SneakyBean.class.getDeclaredField("longList");
-        type = tf.constructType(field.getGenericType());
+        type = TF.constructType(field.getGenericType());
         assertTrue(type instanceof CollectionType);
         CollectionType collectionType = (CollectionType) type;
-        assertEquals(tf.constructType(Long.class), collectionType.getContentType());
+        assertEquals(TF.constructType(Long.class), collectionType.getContentType());
     }
 
     /**
@@ -664,12 +648,11 @@ public void testSneakySelfRefs() throws Exception
     @Test
     public void testAtomicArrayRefParameters()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
-        JavaType type = tf.constructType(new TypeReference<AtomicReference<long[]>>() { });
-        JavaType[] params = tf.findTypeParameters(type, AtomicReference.class);
+        JavaType type = TF.constructType(new TypeReference<AtomicReference<long[]>>() { });
+        JavaType[] params = TF.findTypeParameters(type, AtomicReference.class);
         assertNotNull(params);
         assertEquals(1, params.length);
-        assertEquals(tf.constructType(long[].class), params[0]);
+        assertEquals(TF.constructType(long[].class), params[0]);
     }
 
     static abstract class StringIntMapEntry implements Map.Entry<String,Integer> { }
@@ -677,8 +660,7 @@ static abstract class StringIntMapEntry implements Map.Entry<String,Integer> { }
     @Test
     public void testMapEntryResolution()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
-        JavaType t = tf.constructType(StringIntMapEntry.class);
+        JavaType t = TF.constructType(StringIntMapEntry.class);
         JavaType mapEntryType = t.findSuperType(Map.Entry.class);
         assertNotNull(mapEntryType);
         assertTrue(mapEntryType.hasGenericTypes());
@@ -696,16 +678,15 @@ public void testMapEntryResolution()
     @Test
     public void testRawCollections()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
-        JavaType type = tf.constructRawCollectionType(ArrayList.class);
+        JavaType type = TF.constructRawCollectionType(ArrayList.class);
         assertTrue(type.isContainerType());
         assertEquals(TypeFactory.unknownType(), type.getContentType());
-        type = tf.constructRawCollectionLikeType(CollectionLike.class); // must have type vars
+        type = TF.constructRawCollectionLikeType(CollectionLike.class); // must have type vars
         assertTrue(type.isCollectionLikeType());
         assertEquals(TypeFactory.unknownType(), type.getContentType());
 
         // actually, should also allow "no type vars" case
-        type = tf.constructRawCollectionLikeType(String.class);
+        type = TF.constructRawCollectionLikeType(String.class);
         assertTrue(type.isCollectionLikeType());
         assertEquals(TypeFactory.unknownType(), type.getContentType());
     }
@@ -713,19 +694,18 @@ public void testRawCollections()
     @Test
     public void testRawMaps()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
-        JavaType type = tf.constructRawMapType(HashMap.class);
+        JavaType type = TF.constructRawMapType(HashMap.class);
         assertTrue(type.isContainerType());
         assertEquals(TypeFactory.unknownType(), type.getKeyType());
         assertEquals(TypeFactory.unknownType(), type.getContentType());
 
-        type = tf.constructRawMapLikeType(MapLike.class); // must have type vars
+        type = TF.constructRawMapLikeType(MapLike.class); // must have type vars
         assertTrue(type.isMapLikeType());
         assertEquals(TypeFactory.unknownType(), type.getKeyType());
         assertEquals(TypeFactory.unknownType(), type.getContentType());
 
         // actually, should also allow "no type vars" case
-        type = tf.constructRawMapLikeType(String.class);
+        type = TF.constructRawMapLikeType(String.class);
         assertTrue(type.isMapLikeType());
         assertEquals(TypeFactory.unknownType(), type.getKeyType());
         assertEquals(TypeFactory.unknownType(), type.getContentType());
@@ -740,30 +720,28 @@ public void testRawMaps()
     @Test
     public void testMoreSpecificType()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
-
-        JavaType t1 = tf.constructCollectionType(Collection.class, Object.class);
-        JavaType t2 = tf.constructCollectionType(List.class, Object.class);
-        assertSame(t2, tf.moreSpecificType(t1, t2));
-        assertSame(t2, tf.moreSpecificType(t2, t1));
+        JavaType t1 = TF.constructCollectionType(Collection.class, Object.class);
+        JavaType t2 = TF.constructCollectionType(List.class, Object.class);
+        assertSame(t2, TF.moreSpecificType(t1, t2));
+        assertSame(t2, TF.moreSpecificType(t2, t1));
 
-        t1 = tf.constructType(Double.class);
-        t2 = tf.constructType(Number.class);
-        assertSame(t1, tf.moreSpecificType(t1, t2));
-        assertSame(t1, tf.moreSpecificType(t2, t1));
+        t1 = TF.constructType(Double.class);
+        t2 = TF.constructType(Number.class);
+        assertSame(t1, TF.moreSpecificType(t1, t2));
+        assertSame(t1, TF.moreSpecificType(t2, t1));
 
         // and then unrelated, return first
-        t1 = tf.constructType(Double.class);
-        t2 = tf.constructType(String.class);
-        assertSame(t1, tf.moreSpecificType(t1, t2));
-        assertSame(t2, tf.moreSpecificType(t2, t1));
+        t1 = TF.constructType(Double.class);
+        t2 = TF.constructType(String.class);
+        assertSame(t1, TF.moreSpecificType(t1, t2));
+        assertSame(t2, TF.moreSpecificType(t2, t1));
     }
 
     // [databind#489]
     @Test
     public void testCacheClearing()
     {
-        TypeFactory tf = TypeFactory.defaultInstance().withModifier(null);
+        TypeFactory tf = TF.withModifier(null);
         assertEquals(0, tf._typeCache.size());
         tf.constructType(getClass());
         // 19-Oct-2015, tatu: This is pretty fragile but
@@ -776,7 +754,7 @@ public void testCacheClearing()
     @Test
     public void testRawMapType()
     {
-        TypeFactory tf = TypeFactory.defaultInstance().withModifier(null); // to get a new copy
+        TypeFactory tf = TF.withModifier(null); // to get a new copy
 
         JavaType type = tf.constructParametricType(Wrapper1297.class, Map.class);
         assertNotNull(type);
@@ -786,9 +764,7 @@ public void testRawMapType()
     // for [databind#3443]
     @Test
     public void testParameterizedClassType() {
-        TypeFactory tf = TypeFactory.defaultInstance();
-
-        JavaType t = tf.constructType(new TypeReference<Class<? extends CharSequence>>() { });
+        JavaType t = TF.constructType(new TypeReference<Class<? extends CharSequence>>() { });
 
         assertEquals(SimpleType.class, t.getClass());
         assertEquals(1, t.containedTypeCount());
@@ -798,10 +774,8 @@ public void testParameterizedClassType() {
     // for [databind#3876]
     @Test
     public void testParameterizedSimpleType() {
-        TypeFactory tf = TypeFactory.defaultInstance();
-
-        JavaType charSequenceClass = tf.constructType(new TypeReference<Class<? extends CharSequence>>() { });
-        JavaType numberClass = tf.constructType(new TypeReference<Class<? extends Number>>() { });
+        JavaType charSequenceClass = TF.constructType(new TypeReference<Class<? extends CharSequence>>() { });
+        JavaType numberClass = TF.constructType(new TypeReference<Class<? extends Number>>() { });
 
         assertEquals(SimpleType.class, charSequenceClass.getClass());
         assertEquals(SimpleType.class, numberClass.getClass());
diff --git a/src/test/java/com/fasterxml/jackson/databind/type/TypeFactoryWithRecursiveTypesTest.java b/src/test/java/com/fasterxml/jackson/databind/type/TypeFactoryWithRecursiveTypesTest.java
index 24ff48a16d..a99baf7dec 100644
--- a/src/test/java/com/fasterxml/jackson/databind/type/TypeFactoryWithRecursiveTypesTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/type/TypeFactoryWithRecursiveTypesTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -13,7 +14,7 @@
 
 
 // https://github.com/FasterXML/jackson-databind/issues/1647
-public class TypeFactoryWithRecursiveTypesTest
+public class TypeFactoryWithRecursiveTypesTest extends DatabindTestUtil
 {
     static interface IFace<T> { }
 
@@ -29,7 +30,7 @@ static class Sub extends Base {
 
     @Test
     public void testBasePropertiesIncludedWhenSerializingSubWhenSubTypeLoadedAfterBaseType() throws IOException {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         tf.constructType(Base.class);
         tf.constructType(Sub.class);
         Sub sub = new Sub();
diff --git a/src/test/java/com/fasterxml/jackson/databind/type/TypeResolutionTest.java b/src/test/java/com/fasterxml/jackson/databind/type/TypeResolutionTest.java
index c437a819af..9e622909ef 100644
--- a/src/test/java/com/fasterxml/jackson/databind/type/TypeResolutionTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/type/TypeResolutionTest.java
@@ -7,12 +7,13 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertSame;
 
 @SuppressWarnings("serial")
-public class TypeResolutionTest
+public class TypeResolutionTest extends DatabindTestUtil
 {
     public static class LongValuedMap<K> extends HashMap<K, Long> { }
 
@@ -41,7 +42,7 @@ static class DoubleRange extends Range<Double> {
     @Test
     public void testMaps()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         JavaType t = tf.constructType(new TypeReference<LongValuedMap<String>>() { });
         MapType type = (MapType) t;
         assertSame(LongValuedMap.class, type.getRawClass());
@@ -52,7 +53,7 @@ public void testMaps()
     @Test
     public void testListViaTypeRef()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         JavaType t = tf.constructType(new TypeReference<MyLongList<Integer>>() {});
         CollectionType type = (CollectionType) t;
         assertSame(MyLongList.class, type.getRawClass());
@@ -62,7 +63,7 @@ public void testListViaTypeRef()
     @Test
     public void testListViaClass()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         JavaType t = tf.constructType(LongList.class);
         JavaType type = (CollectionType) t;
         assertSame(LongList.class, type.getRawClass());
@@ -72,7 +73,7 @@ public void testListViaClass()
     @Test
     public void testGeneric()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
 
         // First, via simple sub-class
         JavaType t = tf.constructType(DoubleRange.class);
diff --git a/src/test/java/com/fasterxml/jackson/databind/util/BeanUtilTest.java b/src/test/java/com/fasterxml/jackson/databind/util/BeanUtilTest.java
index c73bd93952..929ea927f4 100644
--- a/src/test/java/com/fasterxml/jackson/databind/util/BeanUtilTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/util/BeanUtilTest.java
@@ -18,7 +18,7 @@ public class BeanUtilTest extends DatabindTestUtil
     @Test
     public void testGetDefaultValue()
     {
-        TypeFactory tf = TypeFactory.defaultInstance();
+        TypeFactory tf = defaultTypeFactory();
         // For collection/array/Map types, should give `NOT_EMPTY`:
         assertEquals(JsonInclude.Include.NON_EMPTY,
                 BeanUtil.getDefaultValue(tf.constructType(Map.class)));
diff --git a/src/test/java/com/fasterxml/jackson/databind/util/ClassUtilTest.java b/src/test/java/com/fasterxml/jackson/databind/util/ClassUtilTest.java
index 6181c5ae4a..9a99eb1e76 100644
--- a/src/test/java/com/fasterxml/jackson/databind/util/ClassUtilTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/util/ClassUtilTest.java
@@ -71,6 +71,8 @@ public void voidMethod() { }
         public void setMethod(int x) { }
     }
 
+    private final TypeFactory TF = defaultTypeFactory();
+
     /*
     /**********************************************************
     /* Test methods
@@ -243,9 +245,9 @@ public void testDescs()
         final String stringExp = "`java.lang.String`";
         assertEquals(stringExp, ClassUtil.getClassDescription("foo"));
         assertEquals(stringExp, ClassUtil.getClassDescription(String.class));
-        final JavaType stringType = TypeFactory.defaultInstance().constructType(String.class);
+        final JavaType stringType = TF.constructType(String.class);
         assertEquals(stringExp, ClassUtil.getTypeDescription(stringType));
-        final JavaType mapType = TypeFactory.defaultInstance().constructType(
+        final JavaType mapType = TF.constructType(
                 new TypeReference<Map<String, Integer>>() { });
         assertEquals("`java.util.Map<java.lang.String,java.lang.Integer>`",
                 ClassUtil.getTypeDescription(mapType));
@@ -254,7 +256,7 @@ public void testDescs()
     @Test
     public void testSubtypes()
     {
-        final JavaType stringType = TypeFactory.defaultInstance().constructType(String.class);
+        final JavaType stringType = TF.constructType(String.class);
         List<JavaType> supers = ClassUtil.findSuperTypes(stringType, Object.class, false);
         assertEquals(Collections.emptyList(), supers);
 
diff --git a/src/test/java/com/fasterxml/jackson/databind/util/JacksonCollectorsTest.java b/src/test/java/com/fasterxml/jackson/databind/util/JacksonCollectorsTest.java
new file mode 100644
index 0000000000..e589d045b1
--- /dev/null
+++ b/src/test/java/com/fasterxml/jackson/databind/util/JacksonCollectorsTest.java
@@ -0,0 +1,33 @@
+package com.fasterxml.jackson.databind.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import java.util.stream.IntStream;
+import org.junit.jupiter.api.Test;
+
+public class JacksonCollectorsTest {
+
+    @Test
+    public void testToArrayNode()
+    {
+        final ObjectMapper objectMapper = new ObjectMapper();
+
+        final JsonNode jsonNodeResult = IntStream.range(0, 10)
+            .mapToObj(i -> {
+                ObjectNode objectNode = objectMapper.createObjectNode();
+                objectNode.put("testString", "example");
+                objectNode.put("testNumber", i);
+                objectNode.put("testBoolean", true);
+
+                return objectNode;
+            })
+            .collect(JacksonCollectors.toArrayNode());
+
+        assertEquals(10, jsonNodeResult.size());
+        jsonNodeResult.forEach(jsonNode -> assertFalse(jsonNode.isEmpty()));
+    }
+}
diff --git a/src/test/java/com/fasterxml/jackson/databind/util/TokenBufferTest.java b/src/test/java/com/fasterxml/jackson/databind/util/TokenBufferTest.java
index 6bc0689ba1..8be86ecc58 100644
--- a/src/test/java/com/fasterxml/jackson/databind/util/TokenBufferTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/util/TokenBufferTest.java
@@ -236,6 +236,57 @@ public void testNumberOverflowLong() throws IOException
         }
     }
 
+    @Test
+    public void testNumberIntAsString() throws IOException
+    {
+        try (TokenBuffer buf = new TokenBuffer(null, false)) {
+            buf.writeNumber("123", true);
+            try (JsonParser p = buf.asParser()) {
+                assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
+                assertEquals(NumberType.BIG_INTEGER, p.getNumberType());
+                assertEquals(123, p.getIntValue());
+            }
+        }
+        try (TokenBuffer buf = new TokenBuffer(null, false)) {
+            buf.writeNumber("-123", true);
+            try (JsonParser p = buf.asParser()) {
+                assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
+                assertEquals(NumberType.BIG_INTEGER, p.getNumberType());
+                assertEquals(-123L, p.getLongValue());
+            }
+        }
+        try (TokenBuffer buf = new TokenBuffer(null, false)) {
+            buf.writeNumber("123", false);
+            try (JsonParser p = buf.asParser()) {
+                assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
+                assertEquals(NumberType.BIG_DECIMAL, p.getNumberType());
+                assertEquals(123.0, p.getFloatValue());
+            }
+        }
+        // legacy method assumes Decimal type
+        try (TokenBuffer buf = new TokenBuffer(null, false)) {
+            buf.writeNumber("123");
+            try (JsonParser p = buf.asParser()) {
+                assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
+                assertEquals(NumberType.BIG_DECIMAL, p.getNumberType());
+                assertEquals(123.0, p.getFloatValue());
+            }
+        }
+    }
+
+    @Test
+    public void testNumberNonIntAsStringNoCoerce() throws IOException
+    {
+        try (TokenBuffer buf = new TokenBuffer(null, false)) {
+            buf.writeNumber("1234.567", true);
+            try (JsonParser p = buf.asParser()) {
+                assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
+                assertEquals(NumberType.BIG_INTEGER, p.getNumberType());
+                assertThrows(NumberFormatException.class, p::getIntValue);
+            }
+        }
+    }
+
     @Test
     public void testBigIntAsString() throws IOException
     {
diff --git a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithInjectables639Test.java b/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithInjectables639Test.java
deleted file mode 100644
index c44c7c956d..0000000000
--- a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithInjectables639Test.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.fasterxml.jackson.failing;
-
-import org.junit.jupiter.api.Test;
-
-import com.fasterxml.jackson.annotation.*;
-
-import com.fasterxml.jackson.databind.InjectableValues;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
-
-// This is probably impossible to handle, in general case, since
-// there is a cycle for Parent2/Child2... unless special handling
-// could be made to ensure that
-class ObjectIdWithInjectables639Test extends DatabindTestUtil {
-    public static final class Context {
-    }
-
-    @JsonIdentityInfo(generator = ObjectIdGenerators.IntSequenceGenerator.class)
-    public static final class Parent1 {
-        public Child1 child;
-
-        public Parent1() {
-        }
-    }
-
-    @JsonIdentityInfo(generator = ObjectIdGenerators.IntSequenceGenerator.class)
-    public static final class Child1 {
-
-        @JsonProperty
-        private final Parent1 parent;
-
-        @JsonCreator
-        public Child1(@JsonProperty("parent") Parent1 parent) {
-            this.parent = parent;
-        }
-    }
-
-    @JsonIdentityInfo(generator = ObjectIdGenerators.IntSequenceGenerator.class)
-    public static final class Parent2 {
-
-        protected final Context context;
-
-        public Child2 child;
-
-        @JsonCreator
-        public Parent2(@JacksonInject Context context) {
-            this.context = context;
-        }
-    }
-
-    @JsonIdentityInfo(generator = ObjectIdGenerators.IntSequenceGenerator.class)
-    public static final class Child2 {
-
-        protected final Context context;
-
-        @JsonProperty
-        protected Parent2 parent;
-
-        @JsonCreator
-        public Child2(@JacksonInject Context context,
-                      @JsonProperty("parent") Parent2 parent) {
-            this.context = context;
-            this.parent = parent;
-        }
-    }
-
-    @Test
-    void objectIdWithInjectables() throws Exception {
-        ObjectMapper mapper = new ObjectMapper();
-        Context context = new Context();
-        InjectableValues iv = new InjectableValues.Std().
-                addValue(Context.class, context);
-        mapper.setInjectableValues(iv);
-
-        Parent1 parent1 = new Parent1();
-        Child1 child1 = new Child1(parent1);
-        parent1.child = child1;
-
-        Parent2 parent2 = new Parent2(context);
-        Child2 child2 = new Child2(context, parent2);
-        parent2.child = child2;
-
-        String json = mapper.writeValueAsString(parent1);
-        parent1 = mapper.readValue(json, Parent1.class);
-//            System.out.println("This works: " + json);
-
-        json = mapper.writeValueAsString(parent2);
-//System.out.println("This fails: " + json);
-        parent2 = mapper.readValue(json, Parent2.class);
-    }
-}