Merge branch 'portal-update' into welcome-landing