default shape is line
Merge branch 'hotfix/hotfix-1', chaneged default shape to line