Merge "Handle volumes without visible paths." into mnc-dev