Converted to using topic data-object.add.
Merge remote-tracking branch 'origin/dev' into dev