Fix some problems introduced with the previous commit for #63427.
Merge branch 'master' into ascraeus