Merge "Use offset in line drawing" into jb-mr1-dev