Move portmapper initialization to var block Upstream-commit: b85cf5da5e27014ff2e5499d91168678c5c99caa Component: engine