Merge remote-tracking branch 'origin/main' into release-4.3

Merge remote-tracking branch 'origin/main' into release-4.3 #2859