Merge remote-tracking branch 'upstream/main' into use-latest-respec