Part of the Functional File System (FFS) commit, using the safe settings from FileSystem (take 2 - committed the wrong code before).