merge to v3