Merge branch 'hotfix/show_joseph_link_on_message_board' into develop
Merge branch 'develop'