Missing attachments (files/dirs) causing bulk export/import to fail

We have a fix submitted for this, which we are planning to backport to 5.37.x.