[[ Bug 13717 ]] Fix various linkatts issues
Merge pull request #1306 from runrevali/bugfix-13717

[[ Bug 13717 ]] Fix various linkatts issues