FORUM-950 | [Forum] Added tags disappear when coming back to the topic again
Merge commit 'b9bf731472bc20c790ac37c9f6d0359072411323' into HEAD