Merge pull request #5478 from BKPepe/drop-file-server