Merge "Port the current code to new IncFS"