Trek/hotfix 10530 hardcoded links