Merge "Remove wf* function usage from FSFileBackend"