Merge "Initial support for concurrency"