Merge branch 'recipients-inline' into 'develop'

ForceMentionsInContent: wrap mentions in a span, fix the formatting

See merge request !3620
18 jobs for develop in 12 minutes and 21 seconds (queued for 6 seconds)