new link route hotfix rework

Matas Rastenis requested to merge new-link-hotfixes into master

Merge request reports