chore: merge main into adapter-v2#163

handcaught wants to merge 2 commits into

adapter-v2brokenbots/criteria:adapter-v2from

mainbrokenbots/criteria:mainCopy head branch name to clipboard