Update spirit from develop.