Merge branch 'cm/lvm'