Merge "Prepare for LVM based VCP"