ppc: merged conformal/master, tests FAIL #TODO