FORUM-1008 | Answers of a question is shown incorrectly on Activity Stream
Merge commit 'bd62687793e9ca91abfd49cd7ddb2230851f253f' into HEAD