Merge branch 'canary' into feat/add-terminal-permission