merge update from ecomfe