small refactoring
Merge branch 'refs/heads/appsembler_develop' into feature/messages