Fix compile failure due to changes in the portal master (6.2) branch