[CLC-1734] Too many types of links
Merge pull request #998 from yuhunglin/CLC-1734

[CLC-1734] Too many types of links