Merge "On ARPHandler restart Threads are left dangling, very visible in the IT tests"