Merge branch '2257-self-chat' into 'develop'