Merge "Improvements to styling of connection lines"