file upload and download bug fix
Merge branch 'xcc'