chore: pull in upstream changes v16.4.2#5

ReenigneArcher merged 3 commits intomasterLizardByte/contribkit:masterfrom

chore/pull-in-upstream-changesLizardByte/contribkit:chore/pull-in-upstream-changesCopy head branch name to clipboard