Merge branch 'nm-server-port'