Merge remote-tracking branch 'origin/main' into v1.9.x