Merged changes from newcore
2 files changed