Merge "Adds Cinder client"