Rewrite recursion to while loop in resolveCtx
Merge branch 'pr/213'
build