Minor upload rework

Matas Rastenis requested to merge upload-rework-minor into master

Merge request reports