Merge "Merge the separated link lines on service client"