Use zipped artifact dependencies together with other root files

My dependency build can be configured to either produce single files stored directly at artifact root or single zip which contains these files. I would like to be able to switch between these two options without needing to change how depended builds get the artfiacts from the dependency. To do that I tried to configure artifact depedency as:

Files.zip!**
+:**/*
-:Files.zip

I would imagine this tries to extract Files.zip and extracts all other root files except the zip itself. That would give me chance to extract all files from zip, do not download the zip and add all other unzipped files (if there are any). However, it fails with the error that artifacts were not found.

I am not entirely sure whether there are two issues or just one. Part of the issue could be that **/* fails as there are no artifacts to upload (https://youtrack.jetbrains.com/issue/TW-19132) and other part of the issue could be conflicting lines

Files.zip!**
-:Files.zip

BTW.
Even more useful with similar setup would if I could also add 7z. 

Files.7z!**
+:**/*
-:Files.7z
Files.zip!**
-:Files.zip

But this would definitely require TW-19132 mentioned above because there would be always 7z or zip, never both of them.