[ui.upload] correction of drop data analyzation
Merge branch '2.1' into 2.1_n