diff --git a/modules/Scaffolding b/modules/Scaffolding
index ce3c480287..26822d4c87 160000
--- a/modules/Scaffolding
+++ b/modules/Scaffolding
@@ -1 +1 @@
-Subproject commit ce3c4802873c0a64baf847544e65b3694c099005
+Subproject commit 26822d4c876ee6203014eaf6df398c874c4535ea
diff --git a/modules/Templating b/modules/Templating
index 4984b2da89..f0991b4e6d 160000
--- a/modules/Templating
+++ b/modules/Templating
@@ -1 +1 @@
-Subproject commit 4984b2da890a662362cb728ac1a3f605ec9448bc
+Subproject commit f0991b4e6daaf3acd0403b303b9b5142521a1572