Merge "Added portal-FE-os components"