Merge main branch and resolve conflicts in templateParser and helpers tests#33

Copilot wants to merge 14 commits intodevstonegray/magic-proxy:devfrom

copilot/sub-pr-30stonegray/magic-proxy:copilot/sub-pr-30Copy head branch name to clipboard