v3.0.12
cf6f59af · Merge branch 'cherry-pick-562f4ab5' into 'stable-3.0' ·