INFRA-642, additional fixes on link case