Merge "[TC] Follow the changed EFL migration API and structure"