Merge "Add LVM NVMe support"