- no functional changes in this patch - preparation for interface change allowing custom target links in #2532