chore: sync hotfix from main into canary [skip ci]