Snapshot WIP on v2 before starting v3