Merge "Fix port clean up race condition"