Merge branch 'irc-dialog-579800'