Merge "Add thread ID reuse to API contract"