upstream-618cf9b5-fix-broken-files-view
