RAZ-1913 - ZIP extracting: Still doesn't work if ZIP is extracted in subfolders! :  Updated based on the directory level.
Merge branch 'feature/issue_1913' into develop