Update geometry, config from develop.