Merging changes with squash
Fixing bug in core files (developer ABC)
Fixing bug 2 in core files (developer ABC)
New change in core files from developer 123
Merge conflict solved