Merge "Add thread annotations (1/n)"