Merge branch 'maint-0.3.0' into maint-0.3.1

This is an "ours" commit to avoid taking the fix for 22838,
which we already have here.