[[ Bug 13717 ]] Fix various linkatts issues