Added better handling of changed topics.
Merge branch 'test' into dev