Merge "Better handling of storage paths." into mnc-dev