Merge "Fix unit test Eclipse-deadlock-of-death"