Merge branch 'main' into next

Author: jeffwilcox

.github/workflows/build.yml

@@ -17,8 +17,7 @@ jobs:
     - name: "Build the site"
       run: |
         npm install
-        NEXT_ENV_DESCRIPTOR=dev NEXT_ONE_DS_INSTRUMENTATION_KEY= npm run build
-        #NEXT_ENV_DESCRIPTOR=production NEXT_ONE_DS_INSTRUMENTATION_KEY=b341ec446e65436485df678003ce82f7 npm run build
+        NEXT_ENV_DESCRIPTOR=production NEXT_ONE_DS_INSTRUMENTATION_KEY=b341ec446e65436485df678003ce82f7 npm run build
     - name: "Stamp content.json"
       env:
         GITSHA: ${{ github.sha }}