Merge remote-tracking branch 'origin/main' into v2.17.x