LPS-36407 add method taking companyId
LPS-36407 SF
LPS-36407 Regen
LPS-36572 SF