Merge pull request #21148 from deepeshgarg007/travis_company_fixtures

fix: Travis