Update geometry, align from develop.