Refactor #5580: Fix merge issues in FileUtils