LPS-30715 Handled companyId extraction from ServiceContext