Debugger: use partialBodyResolve. Don't compete variables defined after context element
Buildserver auto merge