Merge "Fixed concurrency problems"