Add flexible edf

Merge branch 'main' into devel

# Conflicts:
#	DESCRIPTION