Merge branch 'hotfix/foc-links'
Updating events module correctly
Merge branch 'refs/heads/master' into develop