BZ-13105 empty company name
Merge branch 'competitive-estimates' into integration