Converted file chunk object to use file IDs
Merge remote-tracking branch 'origin/master'
Merged with Darby