remove concurrency issue
Merge branch 'Enterprise_Pilot_1.0' into LiamConcurrencyfix