MDL-33424 Images missing when restoring a 1.9 backup
Results of David's review