Merge "Add a flag for tid affinity check" into main