Better logging when ports are closed
Merge branch 'test' into dev