Merge with local changes (EMIF requirements)