added port to the actual config on setup
Merge remote-tracking branch 'origin/testing'