Update optional, geometry from develop.