CON-21: Message refactoring and some doc added
Merge branch 'CON-21' into consumer-sprint38-CON-9