Merge "Fix incoming chat session"