Rebase EFS-project on the latest source code