AH with link
Merge pull request #4915 from Intercross21/master

Emergency hotfix for #4908