Squashed 'CoreFiles/' changes from 1989e81..dfed6a0

dfed6a0 last change 2...
6025480 last change on core functionality developer 123

git-subtree-dir: CoreFiles
git-subtree-split: dfed6a0663d89b213eeab9c1f5c37461d397a830
Merging changes on core files