Merge "Restore "Add scenario 'test_preserve_preexisting_port'""