Merge remote-tracking branch 'upstream/main' into lint-tests