Merge "Migrate ambiguous getId method into getLink" into tm-qpr-dev