Merge pull request #22288 from scmmishra/support-portal-fixes