fix: Phase 2 — backport 5 high-priority upstream bug fixes#27

e6qu merged 1 commit intodeve6qu/frankencode:devfrom

phase2/upstream-fixese6qu/frankencode:phase2/upstream-fixesCopy head branch name to clipboard