Topic dojo upgrade

@CHenrie Please review.