Merge "Adding new components with portal-FE-common"