Update core to master