[*][Patch for EFL core migration] Merge branch 'efl_core'