RAZ-2230: ZIP files would not properly be added due to new trash function