Palautettu porttitieto.
Merge remote-tracking branch 'origin/develop'
Merge branch 'develop'
OSTJ-39, OSTJ-40