Merge pull request #2664 from rosysong/file-server