v3.1.2
2f74b2d3 · Merge branch 'cherry-pick-562f4ab5' into 'stable-3.1' ·