BS-10723, change api call context to handle compound id