Merge branch 'sdombrovsky/virtual_lines'