Merge "Fix publishing RPC Server on the same address/port after a short time"