Merge branch 'release-3.1'