Merge remote-tracking branch 'upstream/main' into upstream-sync · stevendborrelli/function-conditional-patch-and-transform@0590290