For ENG-5865, fix some but not all SnapshotSave buffer management issues