Fix single file upload.
Fix key updates when local copy has changed.
Merge branch 'fix_single_file_upload'