Merge "TempFSFileFactory service"