Merge "Portal - enable VID HTTPS"