[PATCH] Necessary change to make company_id not required
Merge remote-tracking branch 'origin/7.0' into 7.0