Merge "Merge the separated link lines on volume client"