Merge branch 'portal_links'

4 jobs for master in 2 minutes and 32 seconds (queued for 6 seconds)