Backports some of the recent link configuration changes
lgtm
Pull-Request has been merged by anitazha
Backports some of the recent link configuration changes