FS-24: Moved part of the FileManager's responsibility to the ClientFileConnector.