Update core, spirit from develop.