Merge pull request #24996 from prssanna/help-links-fix