Updated core to latest from master