Merge branch 'hx/negotiator-non-recursive'