1.2 with eco changes from feature/erp branch