Merge branch 'hotfix/company-select-box'
bug fixes
Merge branch 'hotfix/misc' into develop