Merge "Error if threads leak." into feature/zuulv3