fix filename collsions in file uploads

Hayat requested to merge fix-filename-collisions-in-file-upload into main

split from !2314 (merged)

depends on !2318 (merged)

Edited by Bengfort

Merge request reports