Fixing problem with message sender
Merge branch 'feature/47795485/tab-manager' into develop