Merge "Correct drawLines annotations"