Merge from v2 updates