TOOLS-79: Download failures: multiple folders, IMAs, etc. (and related UI issues)