Merge remote-tracking branch 'origin/6.4' into 7.1

Merge remote-tracking branch 'origin/6.4' into 7.1 #22742