Merge remote-tracking branch 'upstream/7.3' into 7.3

Merge remote-tracking branch 'upstream/7.3' into 7.3 #23422