chore: cherry-pick upstream sweep-up (2 tiny commits) — batch 8#13

prospapledge88 merged 3 commits intodevprospapledge88/Archon:devfrom

chore/cherry-pick-upstream-tier7-reliabilityprospapledge88/Archon:chore/cherry-pick-upstream-tier7-reliabilityCopy head branch name to clipboard