bugid-69126: Better handling for pipes within bracketed syntax for template editor
Merge branch 'bugid-69126' into dev