v3.0.3
3c9bf89b · Merge branch 'cherry-pick-e647aeef' into 'stable-3.0' ·