DEV-7 | Re-format forwarded port