Merge "Add concurrency tests for Cinder operations"