FIX for no port set for db
Merge branch 'hotfix-7.1.5' into develop