Add port to HTTP web service calls
Merge remote-tracking branch 'origin/master'