Fix link from truncated entry names
Merge branch 'branch_v2plus_3320' into branch_v2plus