Merge "[CLI] Update port value"