Backport 53901 and 53902 to prevent crash when there is an error decoding unicode filenames
2 files changed