[CLC-1890] Race condition with UserData entries
Merge pull request #1127 from yuhunglin/CLC-1890

[CLC-1890] Race condition with UserData entries