Add settings to control the line around the circle
Merge remote-tracking branch 'origin/line-around-settings' into develop