diff --git a/HISTORY.rst b/HISTORY.rst
index 7587f549..b6bd269b 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -16,6 +16,7 @@ PlatformIO Core 6
 6.1.4 (2022-??-??)
 ~~~~~~~~~~~~~~~~~~
 
+* Added support for accepting the original FileNode environment in a "callback" function when using `Build Middlewares <https://docs.platformio.org/en/latest/scripting/middlewares.html>`__ (`pull #4380 <https://github.com/platformio/platformio-core/pull/4380>`_)
 * Improved device port finder when using dual channel UART converter (`issue #4367 <https://github.com/platformio/platformio-core/issues/4367>`_)
 * Improved project dependency resolving when using the `pio project init --ide <https://docs.platformio.org/en/latest/core/userguide/project/cmd_init.html>`__ command
 * Upgraded build engine to the SCons 4.4.0 (`release notes <https://github.com/SCons/scons/releases/tag/4.4.0>`__)
diff --git a/docs b/docs
index 2175b369..f79c01f6 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 2175b369e206d000e1cca1f14ba2d309b358790a
+Subproject commit f79c01f6f3825d413e9e6f92b9c3cba899860c8b
diff --git a/platformio/builder/tools/piobuild.py b/platformio/builder/tools/piobuild.py
index 06937e58..9652eabe 100644
--- a/platformio/builder/tools/piobuild.py
+++ b/platformio/builder/tools/piobuild.py
@@ -296,6 +296,8 @@ def CollectBuildFiles(
                 new_node = callback(env, new_node)
             else:
                 new_node = callback(new_node)
+            if not new_node:
+                break
         if new_node:
             new_sources.append(new_node)