Merge branch 'hotfix/company-link'
client edit index mistypes fixed
Merge branch 'hotfix/quickfix' into develop