Consider adoption of PR #1051 for the main branch

[frivoal]

PR #1051 was merged into the topic branch ab-tag-discipline, but it has no dependency on anything else in that branch, and could, if we wanted to, be applied to the main branch. This is an issue to remember thinking about whether we want to do that.