Merge branch 'fixMentionsInTickets-985'