Merge "Storage fix for the KVM scenario"