diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
new file mode 100644
index 000000000..8cfafe37a
--- /dev/null
+++ b/.github/codeql/codeql-config.yml
@@ -0,0 +1,5 @@
+name: "CodeQL Configuration File"
+
+queries:
+  - uses: security-and-quality
+  - uses: security-extended 
diff --git a/.github/workflows/codeql-build.yml b/.github/workflows/codeql-build.yml
new file mode 100644
index 000000000..e065bd205
--- /dev/null
+++ b/.github/workflows/codeql-build.yml
@@ -0,0 +1,59 @@
+name: "CodeQL Analysis"
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+env:
+  SIMULATION: native
+  ENABLE_UNIT_TESTS: true
+  OMIT_DEPRECATED: true
+
+jobs:
+
+  CodeQL-Build:
+
+    strategy:
+      matrix:
+        buildtype: [debug, release]
+
+    runs-on: ubuntu-18.04
+    env:
+        BUILDTYPE: ${{ matrix.buildtype }}
+    steps:
+      # Checks out a copy of your repository on the ubuntu-latest machine
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+         languages: c
+         config-file: ./.github/codeql/codeql-config.yml
+
+      # Setup the build system
+      - name: Copy sample_defs
+        run: |
+          cp ./cfe/cmake/Makefile.sample Makefile
+          cp -r ./cfe/cmake/sample_defs sample_defs
+
+      # Setup the build system
+      - name: Make Install
+        run: make install
+
+      - name: List cpu1
+        run: ls build/exe/cpu1/
+
+      - name: Run cFS
+        run: |
+          ./core-cpu1 > cFS_startup_cpu1.txt &
+          sleep 30
+          ../host/cmdUtil --endian=LE --pktid=0x1806 --cmdcode=2 --half=0x0002
+        working-directory: ./build/exe/cpu1/
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..b1c395c05
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,13 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+For general cFS vulnerabilities please [open a cFS framework issue](https://github.com/nasa/cfs/issues/new/choose).
+
+Please use the "Bug Report" template and provide as much information as possible. Apply appropraite labels for each report. For security related reports, tag the issue with the "security" label.
+
+## Additional Support
+
+For additional support, email us at cfs-program@lists.nasa.gov. For help using OSAL and cFS, [subscribe to our mailing list](https://lists.nasa.gov/mailman/listinfo/cfs-community) that includes all the community members/users of the NASA core Flight Software (cFS) product line. The mailing list is used to communicate any information related to the cFS product such as current releases, bug findings and fixes, enhancement requests, community meeting notifications, sending out meeting minutes, etc.
+
+If you wish to report a cybersecurity incident or concern please contact the NASA Security Operations Center either by phone at 1-877-627-2732 or via email address soc@nasa.gov.
diff --git a/apps/ci_lab b/apps/ci_lab
index adc0edb70..445fd6ccb 160000
--- a/apps/ci_lab
+++ b/apps/ci_lab
@@ -1 +1 @@
-Subproject commit adc0edb707bdd8595654676deddf4dda4f39c669
+Subproject commit 445fd6ccbeb20780b19614eb3ac67f1f0fc96c5e
diff --git a/apps/sample_app b/apps/sample_app
index b798efc39..6e7cf8855 160000
--- a/apps/sample_app
+++ b/apps/sample_app
@@ -1 +1 @@
-Subproject commit b798efc39900574fa2b08c2588fa2c6e2254ec99
+Subproject commit 6e7cf8855f219c36b7595f32bf046ede0445a398
diff --git a/apps/sample_lib b/apps/sample_lib
index 8f81bfdfd..da2643fba 160000
--- a/apps/sample_lib
+++ b/apps/sample_lib
@@ -1 +1 @@
-Subproject commit 8f81bfdfda3ace8fc9f9f18d4e8bd7ec3b7ef4b9
+Subproject commit da2643fbaa3224c92f71999dd0967399d14f1e60
diff --git a/apps/sch_lab b/apps/sch_lab
index f7b0595e9..c25b0ef2d 160000
--- a/apps/sch_lab
+++ b/apps/sch_lab
@@ -1 +1 @@
-Subproject commit f7b0595e9184cf5b846dc405a18deaac471f8ec8
+Subproject commit c25b0ef2da7793656c1720471ce28d8ae3d36c8c
diff --git a/apps/to_lab b/apps/to_lab
index 47793f0c9..57cfa8bcf 160000
--- a/apps/to_lab
+++ b/apps/to_lab
@@ -1 +1 @@
-Subproject commit 47793f0c9d74bde8b3779717b779ff3c955d7eea
+Subproject commit 57cfa8bcfb1d4211144c35a116121ea94836fae1
diff --git a/cfe b/cfe
index c7363c8d0..4374482cb 160000
--- a/cfe
+++ b/cfe
@@ -1 +1 @@
-Subproject commit c7363c8d0bfbc0ce8d404799c64defe3cb171616
+Subproject commit 4374482cb45f934ef052540d031f33c7ebdf77fa
diff --git a/osal b/osal
index bfca5b21f..09a2c5e79 160000
--- a/osal
+++ b/osal
@@ -1 +1 @@
-Subproject commit bfca5b21f5fc2032505256fc67ae974f53a2a319
+Subproject commit 09a2c5e793639e508174a2446989274acf36f25e
diff --git a/psp b/psp
index 2fcce6f29..0cd14abbb 160000
--- a/psp
+++ b/psp
@@ -1 +1 @@
-Subproject commit 2fcce6f29739a2f91b86b5c296060b57aeed9822
+Subproject commit 0cd14abbb58691eb83afdd816e116f68e681b8e0
diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem
index 10efa7050..2fd986f7d 160000
--- a/tools/cFS-GroundSystem
+++ b/tools/cFS-GroundSystem
@@ -1 +1 @@
-Subproject commit 10efa7050f82a4acc3013e9fddf31fd0ea5efe28
+Subproject commit 2fd986f7d2d6631551355343333106e8aa513102
diff --git a/tools/elf2cfetbl b/tools/elf2cfetbl
index eb5e326a3..6d1d12ea2 160000
--- a/tools/elf2cfetbl
+++ b/tools/elf2cfetbl
@@ -1 +1 @@
-Subproject commit eb5e326a3c85af2dd34735913881f8e15db808db
+Subproject commit 6d1d12ea2d4ab7bcc7044f8e4c60a268d7a1f640
diff --git a/tools/tblCRCTool b/tools/tblCRCTool
index f21a641c7..bb7d143b4 160000
--- a/tools/tblCRCTool
+++ b/tools/tblCRCTool
@@ -1 +1 @@
-Subproject commit f21a641c784b49a811e548b71322b953332e53a3
+Subproject commit bb7d143b44946764df2f787cd5ce27d4f4abfb7c