Optional topic in PubSubByType
Tweaks