add optional guard around message topic
Merge remote-tracking branch 'origin/master'