ENG-4290 Snapshot working with new EE multi-buffer logic.