Merge branch 'v3' into easyV3