Merge "Portal Non-Gui application onboarding changes"