Merge branch 'refactor/guider-resolve-target-coords' into main