merged ECP_materialization back into master