Merge "Refactor debug info position visiting"