fix(backport): absorb upstream reliability fixes (follow-up)#16

bitifirefly merged 2 commits into

developiflabx/opencane:developfrom

backport/upstream-20260322-batch2iflabx/opencane:backport/upstream-20260322-batch2Copy head branch name to clipboard