Fix merge problems, PH, TestModule, TestRoc, edge pixels
Fix merge problems, PH, TestModule, TestRoc, edge pixels