finish file upload and transform
merged from github/master