Merge remote-tracking branch 'upstream/patch_emacs_tty' into main