compliant with edp-1.0.0

Merge changes.