Try to fix some concurrency issues
Try to fix some concurrency issues
Merged from origin