[CLC-1446] Threading activities
Merge pull request #822 from yuhunglin/CLC-1446

[CLC-1446] Threading activities