Artifacts of ecp-master #711