Merge branch 'hotfix/hotfix'
Companies fix
Merge branch 'hotfix/hotfix' into develop