Merge "Setup LV before mkfs"