Case 3063 - Fixed link issue.
Merge remote-tracking branch 'origin/case-3063' into hotfix