Refactoring portallocator Upstream-commit: 3993f9d5818f344199c3b13ae8aa9e6bee22479e Component: engine