Merge branch 'v3.1' into v3.2