Revert "Update portal_master"

This reverts commit b531a50f99f69d1c93ac7bdb31cb751a7ebf188f.
Revert "Revert "Update portal_master""

This reverts commit e764f382887345411e542e9543a517526bd068a1.