Curate and apply safe upstream Carnac PRs#3

Copilot wants to merge 2 commits intodevdoggy8088/carnac:devfrom

copilot/apply-prs-from-original-repodoggy8088/carnac:copilot/apply-prs-from-original-repoCopy head branch name to clipboard