INTEG-222 | [integ-forum] Bugs in Topic Activity
Merge commit '7b260885088080307ca88b94f9ec35c32ef8790d' into HEAD