upstream/2.11.0
16498181 · Merge branch 'cherry-pick-60188e2f' into 'releases/2.11' ·