Merge "Fix implicit lineTo issue"