Merge branch 'branch_v3.1'