diff --git a/.clang-format b/.clang-format
index 2a9c7c7b2..b1c8cdf81 100755
--- a/.clang-format
+++ b/.clang-format
@@ -11,7 +11,7 @@ AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: Empty
 AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
+AllowShortFunctionsOnASingleLine: Empty
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterReturnType: None
diff --git a/apps/sample_lib b/apps/sample_lib
index 20f913532..14710ac0d 160000
--- a/apps/sample_lib
+++ b/apps/sample_lib
@@ -1 +1 @@
-Subproject commit 20f9135329850c49ecca2661facaad8a10fd1dfa
+Subproject commit 14710ac0d777e40d5673d61b0fa6cc54c68200d3
diff --git a/apps/sch_lab b/apps/sch_lab
index 27a2bd71f..2e8c26797 160000
--- a/apps/sch_lab
+++ b/apps/sch_lab
@@ -1 +1 @@
-Subproject commit 27a2bd71fcc3b21eeb17d88cc1524d1a792ec5da
+Subproject commit 2e8c26797f2dbed50ad95b7b83b582b077753f9d
diff --git a/apps/to_lab b/apps/to_lab
index b0e577a9d..dd8d2f72a 160000
--- a/apps/to_lab
+++ b/apps/to_lab
@@ -1 +1 @@
-Subproject commit b0e577a9d5afd48d8cb7cd8b528bc998df883a0a
+Subproject commit dd8d2f72a493f0b09948c12fd9fcaeea2d8b03c3
diff --git a/osal b/osal
index 3597aafd4..360438765 160000
--- a/osal
+++ b/osal
@@ -1 +1 @@
-Subproject commit 3597aafd4b335458fb582c4258204ec593d8f190
+Subproject commit 360438765d7eb83a9e7e15571cda89786f0d8330
diff --git a/psp b/psp
index 37ee8eb2d..39760aa35 160000
--- a/psp
+++ b/psp
@@ -1 +1 @@
-Subproject commit 37ee8eb2d7ce006dc1570b920ae75a7ac5f89d27
+Subproject commit 39760aa35b5bfa2cd58c697af481ec0dbeb7a50a
diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem
index 5c1437574..3263506ae 160000
--- a/tools/cFS-GroundSystem
+++ b/tools/cFS-GroundSystem
@@ -1 +1 @@
-Subproject commit 5c14375741732382cf0b635073b0b3aab25cdca8
+Subproject commit 3263506ae0501eb1d7b9aa6e401ed018bb1f5ffa
diff --git a/tools/elf2cfetbl b/tools/elf2cfetbl
index 8e54e26f2..8f53aee4d 160000
--- a/tools/elf2cfetbl
+++ b/tools/elf2cfetbl
@@ -1 +1 @@
-Subproject commit 8e54e26f24419e0218587574ec717106937e59fe
+Subproject commit 8f53aee4da49f2e432a1ef1396ba5e2df885e733
diff --git a/tools/tblCRCTool b/tools/tblCRCTool
index 8d7e94a45..c8009d3fa 160000
--- a/tools/tblCRCTool
+++ b/tools/tblCRCTool
@@ -1 +1 @@
-Subproject commit 8d7e94a451010527f02e0daecdbe0c00e12c1768
+Subproject commit c8009d3fa9cc397f1b989df0bac71c6830097a65