@melanie, I think the fix for this bug would be to always add the unit to the disk mapping if it is present.
@melanie, I think the fix for this bug would be to always add the unit to the disk mapping if it is present.