ENG-4881 Hashinator save/restore (the saga continues)