Try to spin up another instance if the port is already used
Fix comment
Clean up
Merge branch 'michel_2606_test' into next