Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'