diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md
index 22d8cae..b9144c0 100644
--- a/docs/modernization/debt.md
+++ b/docs/modernization/debt.md
@@ -18,6 +18,11 @@ agent or engineer to remove them without reconstructing context from chat.
 
 ## Recent Reductions
 
+- 2026-06-14: `DEBT-0036` was narrowed again. `execute_canvas_draw_merge_plane_dispatch()`
+  now routes the per-plane framebuffer setup and unbind handling through
+  `execute_canvas_draw_merge_plane_setup(...)` plus
+  `execute_canvas_draw_merge_plane_final_composite(...)`; the per-plane wrapper
+  still owns the plane-selection loop and branch dispatch.
 - 2026-06-14: `DEBT-0036` was narrowed again. `execute_canvas_draw_merge_plane_iteration()`
   now routes the per-plane dispatch wrapper through
   `execute_canvas_draw_merge_plane_dispatch(...)`; the plane loop still owns
diff --git a/docs/modernization/tasks.md b/docs/modernization/tasks.md
index 7e029ac..e9d5d4e 100644
--- a/docs/modernization/tasks.md
+++ b/docs/modernization/tasks.md
@@ -2232,7 +2232,7 @@ ctest --preset desktop-fast --build-config Debug -R "pp_paint_renderer_composito
 
 ### STR-053 - Extract Draw Merge Per-Plane Setup And Unbind
 
-Status: Ready
+Status: Done
 Score: no score movement
 Debt: `DEBT-0036`
 Scope: `src/canvas.cpp`, `src/legacy_canvas_draw_merge_services.h`, `tests/paint_renderer/compositor_tests.cpp`
@@ -2252,6 +2252,8 @@ Done Checks:
 - `docs/modernization/debt.md` records the reduced draw-merge plane setup
   surface.
 
+Closeout: `e8fe66da`
+
 Validation:
 
 ```powershell