Fix conflict with core files
Merge branch 'generic'