Merge pull request #7191 from keymanapp/fix/developer/cherry-pick/7122-compiler-current-line-mismatch fix(developer): compiler mismatch on currentLine 🍒