Merge v2 into main: add drift v2 alongside deprecated v1