fix error when their is no forum
Merge branch 'develop' into release/candidate