diff --git a/pom.xml b/pom.xml
index cc5b410a70..5ac4e0a066 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,11 @@ com.fasterxml.jackson.core.*;version=${project.version}
           <excludes>
             <exclude>**/failing/**/*.java</exclude>
           </excludes>
+<!-- 13-Apr-2018, tatu: for debugging [core#400]
+          <systemPropertyVariables>
+<com.fasterxml.jackson.core.util.BufferRecyclers.trackReusableBuffers>true</com.fasterxml.jackson.core.util.BufferRecyclers.trackReusableBuffers>
+          </systemPropertyVariables>
+-->
         </configuration>
       </plugin>
       <!-- settings are fine, but needed to trigger execution! -->
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
index 9396754404..e1ae184cf1 100644
--- a/release-notes/CREDITS-2.x
+++ b/release-notes/CREDITS-2.x
@@ -145,3 +145,8 @@ Rafal Foltynski (rfoltyns@github)
    (2.9.0)
   * Contributed#208: Make use of `_matchCount` in `FilteringParserDelegate`
    (2.9.0)
+
+Jeroen Borgers (jborgers@github)
+  * Reported, contributed impl for #400: Add mechanism for forcing `BufferRecycler` released
+   (to call on shutdown)
+  (2.9.6)
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
index 3a1c2ba7c5..01ffd72aa3 100644
--- a/release-notes/VERSION-2.x
+++ b/release-notes/VERSION-2.x
@@ -14,6 +14,11 @@ JSON library.
 === Releases ===
 ------------------------------------------------------------------------
 
+2.9.6 (not yet released)
+
+#400: Add mechanism for forcing `BufferRecycler` released (to call on shutdown)
+ (contributed by Jeroen B)
+
 2.9.5 (26-Mar-2018)
 
 No changes since 2.9.4