Merge "Add none to supported fs type"