Merge "Unit test instability fix"