WIP: file management ii

Merged andreas.fenkart requested to merge taw/dss-mainline:MR_file-management_II into master Jun 07, 2021