Fix: Bad space into log
Fix: Deletion of files was broken
Merge remote-tracking branch 'origin/3.5' into develop