Update geometry, spirit from develop.