chore: Merge remote-tracking branch 'upstream/main' into validate-command