Merge "Add qcow2 image support"