conformal/master merged, tests ok