Feature/mob 2551 swa integration 1

That will happen in restoreChatState or createChat