port setting is overridden by environment settings
Merge branch 'master' into security