fix for empty companies
Merge branch 'msg_center2' into testing