Merge core overriding branch to master