Merge master into feature /stabilization
FORUM-790 | Cannot view topics and posts in FORUM after injection
FORUM-769 | Error when click on Forum or Topic link
Merge feature/stabilization into master