diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml
index 97da9750f..17bfd0c65 100644
--- a/.github/workflows/build-documentation.yml
+++ b/.github/workflows/build-documentation.yml
@@ -153,11 +153,10 @@ jobs:
           key: usersguide-buildnum-${{ github.run_number }}
           
   deploy-usersguide:
-    needs: build-usersguide
-    # Name the Job
     name: Deploy Users Guide
-    # Set the type of machine to run on
     runs-on: ubuntu-18.04
+    needs: build-usersguide    
+    if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
 
     steps:
       - name: Cache cFS Build Environment for usersguide
@@ -258,6 +257,7 @@ jobs:
     needs: build-osalguide
     name: Deploy Osal Guide
     runs-on: ubuntu-18.04
+    if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
 
     steps:
       - name: Cache cFS Build Environment for osalguide
@@ -268,7 +268,6 @@ jobs:
           key: osalguide-buildnum-${{ github.run_number }}
           
       - name: Deploy to GitHub
-        if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
         uses: JamesIves/github-pages-deploy-action@3.7.1
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -276,3 +275,4 @@ jobs:
           FOLDER: deploy
           CLEAN: false
           SINGLE_COMMIT: true
+          
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ae7ec6992..40644263b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,7 +24,9 @@ This project and everyone participating in it is governed by the [cFS Code of Co
 
 ### Discussions and Questions
 
-For questions or help, submit a GitHub issue, [join the cfs community mailing list](README.md#join-the-mailing-list).
+For discussions, questions, or ideas, [start a new discussion](https://github.com/nasa/cFS/discussions/new) in the cFS repository under the Discussions tab. 
+
+[Join the cfs community mailing list](README.md#join-the-mailing-list).
 
 
 ### Report Bugs
diff --git a/README.md b/README.md
index 4ad57ca90..a8c1311a8 100644
--- a/README.md
+++ b/README.md
@@ -71,8 +71,9 @@ See related repositories for current open issues.
 
 ## Getting Help
 
-For best results, submit issues:questions or issues:help wanted requests to this repo.
+### Discussions 
 
+You can [start a new discussion](https://github.com/nasa/cFS/discussions/new) for discussions, questions, or ideas, in the cFS repository under the Discussions tab.
 
 ### Join the mailing list
 
@@ -86,7 +87,6 @@ If you'd like to unsubscribe, send an email with the word *unsubscribe* to cfs-c
 
 You can email the cFS Product Team at cfs-program@lists.nasa.gov to explore partnerships and other arrangements for in-depth support.
 
-
 ## Setup
 
 Ensure the following software are installed: Make, CMake, GCC, and Git.  To setup the cFS BUNDLE directly from the latest set of interoperable repositories:
diff --git a/cfe b/cfe
index cfadad69a..eb9c52319 160000
--- a/cfe
+++ b/cfe
@@ -1 +1 @@
-Subproject commit cfadad69aebc29a8151ec664a21173cca755b67a
+Subproject commit eb9c52319fb1f31f72159551735ad5f1365e5a79
diff --git a/osal b/osal
index 7f4ba9679..ce11e7a20 160000
--- a/osal
+++ b/osal
@@ -1 +1 @@
-Subproject commit 7f4ba9679eba187410185a31e1f48126b5685189
+Subproject commit ce11e7a20d4fd9176469659acb1ee3b371ba4291