Update geometry, filesystem from develop.