[dcs] Fix line/column counters
Merge branch 'dcs-master'