Merge "Refactor FileUtils#convertToModernFd" into sc-dev