Resolve merge conflicts with devel branch refactoring#25423

ringabout merged 2 commits into

pr_remove_macrosnim-lang/Nim:pr_remove_macrosfrom

copilot/sub-pr-23562nim-lang/Nim:copilot/sub-pr-23562Copy head branch name to clipboard