Artifacts of emf-edapt-master #2084