diff --git a/FprimeZephyrReference/project/config/FpConfig.h b/FprimeZephyrReference/project/config/FpConfig.h
index 3adfa68..8c2c6f3 100644
--- a/FprimeZephyrReference/project/config/FpConfig.h
+++ b/FprimeZephyrReference/project/config/FpConfig.h
@@ -327,6 +327,10 @@ extern "C" {
 #define FW_FILE_CHUNK_SIZE 512  //!< Chunk size for working with files in the OSAL layer
 #endif
 
+#ifndef FW_ASSERT_COUNT_MAX
+#define FW_ASSERT_COUNT_MAX 4
+#endif
+
 // *** NOTE configuration checks are in Fw/Cfg/ConfigCheck.cpp in order to have
 // the type definitions in Fw/Types/BasicTypes available.
 #ifdef __cplusplus
diff --git a/lib/fprime b/lib/fprime
index abb09e4..e21fa7b 160000
--- a/lib/fprime
+++ b/lib/fprime
@@ -1 +1 @@
-Subproject commit abb09e4a681cd586ac719a7517430637cdc46199
+Subproject commit e21fa7b10973cafc8b19ac9e5fda5975e3593f45
diff --git a/lib/fprime-zephyr b/lib/fprime-zephyr
index 4a149bb..931354e 160000
--- a/lib/fprime-zephyr
+++ b/lib/fprime-zephyr
@@ -1 +1 @@
-Subproject commit 4a149bbed5c7c86fbac44ab8a65791eff97370f9
+Subproject commit 931354e26e39cb711f846e1ca8bb1337ede83b7c