Updated the core.xcore
Merged with master
Fixed merge conflicts