temp6
Refactor Line type
Merge branch 'master' into temp