Merge branch 'main' into cleanup/1221-remove-unused-env-vars

Author: NanaKhadija1980j

scripts/quickstart-verify.sh

@@ -234,4 +234,3 @@ else
   echo "  Review the output above and fix failing steps."
   exit 1
 fi
->>>>>>> origin/main