merges from v2