[manual] Merge release/9.0-staging into release/9.0 (second pass)

[manual] Merge release/9.0-staging into release/9.0 (second pass) #15313