Refactor actors and topics
Merge branch 'devel'