Merge "improve mkfs condition and make fs_type for partitioning optional"