Merge branch 'v3.1.x'