Merge "Fix adding non-freeform tasks to repo." into main