Fixed default port.
Fixed static port encoding.
Merge branch 'test' into dev