Merge main into dev-sync-with-main

Author: ralfhandl

.github/workflows/sync-main-to-dev.yaml

@@ -39,7 +39,7 @@ jobs:
           SYNC="$BASE-sync-with-$HEAD"
 
           git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
-          git merge origin/$HEAD -m "Merge $HEAD into $SYNC" # --allow-unrelated-histories
+          git merge origin/$HEAD -m "Merge $HEAD into $SYNC" ## --allow-unrelated-histories
           git checkout origin/dev src/*
           git checkout origin/dev tests/*
           git commit -m "Restored src/* and tests/*" || echo ""