Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" merge to avoid cherry-picked copy of #25512 fix, which is already in
this branch.