Merge branch 'handle-deleted-files' into develop