Merge branch 'v3.4'