Always explicitly identify the primary topic (#315)
Merge pull request #337 from fsteeg/issue-315-primary

Always explicitly identify the primary topic