Add EFs files
Merge branch 'emilio' into next

Merge EF files'