ppc: merged conformal/master, tests ok