Merge "Add ignore_fs to disk input"