Merge branch v2 release