Update geometry, fusion from develop.