vanguard - Support further variations in the topic.
merge commit