Retrieve the Server Port
Merge branch 'RetrieveServerPort' into AllTogether

* RetrieveServerPort:
  Retrieve the Server Port