RE: Recent merged patches break test cases