PLAT 1517 : Support non-default port