Merge "Issue-ID: PORTAL-366"