Merge tag 'v3.1.0' into tmp-stable