Merge "PortalAdminController up"