merged conformal/master