Gathering mention fix

Mariusz Trelarequested to merge
mt-mention-fix into develop

@bwrona @ABW @Ickiewicz For more details, check MR 178

Merge request reports