Fix classic pipe compatibility for branded outputs#5914

colinhacks wants to merge 2 commits intomaincolinhacks/zod:mainfrom

issue-5648-pipe-brandcolinhacks/zod:issue-5648-pipe-brandCopy head branch name to clipboard