Merge "Fix call to non-existing TempFSFileFactory::getTempFSFile()"