Update config, geometry from develop.