Fix/regenerate after merge (3)
migration script works with SNodePointer
generalized snode migration script