Merge "Add threading annotations"