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