Merge branch 'v3.0'