Merge branch 'hotfix/misc'
typos **
Merge branch 'hotfix/misc1'
Merge branch 'hotfix/misc1' into develop
links updated
Merge branch 'hotfix/company-link' into develop