Upgrade to collections4 across the board except for portal