Merge "add tenderloin device" into ics