Hotfix
Merge branch 'hotfix/FilesDelete' into develop