Merge pull request #5423 in master
fix @link values
Merge pull request #5461
Merge pull request #5461 in develop