Merged core fiels from master branch