Updated Core code
Merge conflicts