Add a missing 'FILESTATE_FOLDER_DELETE'
Merge remote-tracking branch 'origin/dev' into dev