Merge from master.
Use ephemeral ports for tests.