Backport to an old version of the portal