Update geometry, core from develop.