ppc: conformal/master merged, tests ok